diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-04-13 17:28:46 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-04-15 23:07:46 +0200 |
| commit | 1ba5bae490f7e14e475e0b80f03e5f444cdce908 (patch) | |
| tree | f6472ef0551c254835a3c35eadde2720f0bee69a /vcl/win/app/salinst.cxx | |
| parent | d180418fedd4592044c33558426e9ea9be6f1ebd (diff) | |
tdf#106933 vcl: delete D2DWriteTextOutRenderer before exit()
As it happens this DirectWrite stuff is using some thread pool
internally, and that must be shutdown before exit(), as Win32 will
terminate all other threads at that point, and then the thread pool
wants to talk to threads that don't exist any more.
https://blogs.msdn.microsoft.com/oldnewthing/20120427-00/?p=7763/
So convert this from a global variable that is deleted from DllMain()
to a member of SalData, so it is deleted from DeInitVCL().
Change-Id: I51408a07c78758cf0c193ab66b9214d0c9dbd9e3
(cherry picked from commit df556aa47da22f96b3fcd356c12419d3035cba3c)
Reviewed-on: https://gerrit.libreoffice.org/36534
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'vcl/win/app/salinst.cxx')
| -rw-r--r-- | vcl/win/app/salinst.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx index 94ae96d53608..da67ca44582f 100644 --- a/vcl/win/app/salinst.cxx +++ b/vcl/win/app/salinst.cxx @@ -39,6 +39,7 @@ #include "win/salobj.h" #include "win/saltimer.h" #include "win/salbmp.h" +#include "win/winlayout.hxx" #include "salimestatus.hxx" #include "salsys.hxx" |