summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-02-24 17:17:45 +0000
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-02-26 10:10:35 +0100
commit907efefd052782387dd5985ee417b915ac9b9692 (patch)
tree0e4c950368ab082580f4da0259a8f01cc930fb1c /vcl/source
parent575549e9d2dcbc63daf872f3302eedd68f6dddcc (diff)
forcepoint #6 release virtual devices before releasing font cache
Change-Id: Iacfbe7da788235c96519ecd106d09ab534c83849 Reviewed-on: https://gerrit.libreoffice.org/50284 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/app/svmain.cxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 2d33836aea62..8f546feb5f78 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -575,10 +575,6 @@ void DeInitVCL()
}
ImplDeletePrnQueueList();
- delete pSVData->maGDIData.mpScreenFontList;
- pSVData->maGDIData.mpScreenFontList = nullptr;
- delete pSVData->maGDIData.mpScreenFontCache;
- pSVData->maGDIData.mpScreenFontCache = nullptr;
Scheduler::ImplDeInitScheduler();
@@ -616,6 +612,11 @@ void DeInitVCL()
pSVData->maWinData.mpAutoScrollWin = nullptr;
pSVData->maWinData.mpLastWheelWindow = nullptr;
+ delete pSVData->maGDIData.mpScreenFontList;
+ pSVData->maGDIData.mpScreenFontList = nullptr;
+ delete pSVData->maGDIData.mpScreenFontCache;
+ pSVData->maGDIData.mpScreenFontCache = nullptr;
+
// Deinit Sal
if (pSVData->mpDefInst)
{