[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/source

Bjoern Michaelsen bjoern.michaelsen at canonical.com
Fri Apr 15 06:10:43 UTC 2016


 vcl/source/app/svmain.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 831668298d4486889c1414c91fb47ed6dce21db3
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Apr 12 23:23:51 2016 +0200

    lp#1560328: clear cache before disposing rest of VCL
    
    Change-Id: Iac325cf934953c61cb4dbbb67cfbab1777dc45cc
    Reviewed-on: https://gerrit.libreoffice.org/24039
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 952ac03..41243b6 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -335,6 +335,9 @@ VCLUnoWrapperDeleter::disposing(lang::EventObject const& /* rSource */)
 void DeInitVCL()
 {
     ImplSVData* pSVData = ImplGetSVData();
+    // lp#1560328: clear cache before disposing rest of VCL
+    if(pSVData->mpBlendFrameCache)
+        pSVData->mpBlendFrameCache->m_aLastResult.Clear();
     pSVData->mbDeInit = true;
 
     vcl::DeleteOnDeinitBase::ImplDeleteOnDeInit();


More information about the Libreoffice-commits mailing list