diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/win/saldata.hxx | 2 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salgdi.cxx | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index d1464d5958ee..1d54637ffce2 100644 --- a/vcl/inc/win/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -70,6 +70,8 @@ public: // checks if the menuhandle was created by VCL sal_Bool IsKnownMenuHandle( HMENU hMenu ); + bool mbResourcesAlreadyFreed; + public: HINSTANCE mhInst; // default instance handle HINSTANCE mhPrevInst; // previous instance handle diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index e3a660f3f7b1..5d1cd357a186 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -136,6 +136,8 @@ void ImplInitSalGDI() { SalData* pSalData = GetSalData(); + pSalData->mbResourcesAlreadyFreed = false; + // init stock brushes pSalData->maStockPenColorAry[0] = PALETTERGB( 0, 0, 0 ); pSalData->maStockPenColorAry[1] = PALETTERGB( 0xFF, 0xFF, 0xFF ); @@ -315,6 +317,9 @@ void ImplFreeSalGDI() { SalData* pSalData = GetSalData(); + if (pSalData->mbResourcesAlreadyFreed) + return; + // destroy stock objects int i; for ( i = 0; i < pSalData->mnStockPenCount; i++ ) @@ -381,6 +386,8 @@ void ImplFreeSalGDI() // delete temporary font list ImplReleaseTempFonts( *pSalData ); + + pSalData->mbResourcesAlreadyFreed = true; } // ----------------------------------------------------------------------- |