vcl/source/app/svmain.cxx | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 8c04ab5e7b3420de8557ff9ad8e67f601f51211f
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Feb 24 17:17:45 2018 +0000
forcepoint #6 release virtual devices before releasing font cache
Change-Id: Iacfbe7da788235c96519ecd106d09ab534c83849
Reviewed-on: https://gerrit.libreoffice.org/50281
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index f44fd566aabc..1e84db1dd9cf 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -577,10 +577,6 @@ void DeInitVCL()
}
ImplDeletePrnQueueList();
- delete pSVData->maGDIData.mpScreenFontList;
- pSVData->maGDIData.mpScreenFontList = nullptr;
- delete pSVData->maGDIData.mpScreenFontCache;
- pSVData->maGDIData.mpScreenFontCache = nullptr;
// destroy all Sal interfaces before destroying the instance
// and thereby unloading the plugin
@@ -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)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
