[Libreoffice-commits] core.git: vcl/inc vcl/source

[Stephan Bergmann]

 vcl/inc/dbggui.hxx        |    3 +++
 vcl/source/app/dbggui.cxx |    6 +++++-
 vcl/source/app/svmain.cxx |    2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 561539e2a6b2d95bdd372462034642fbf2c72f14
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Mar 24 15:42:42 2014 +0100

    fdo#76179: deleting mpDefaultWin causes a DBG_TESTSOLARMUTEX
    
    ...so deinit support for that only afterwards
    
    Change-Id: I89b8014bd26aecd9da67eaddc4a8facc620bf16e

diff --git a/vcl/inc/dbggui.hxx b/vcl/inc/dbggui.hxx
index b701aaa..d0b0f7a 100644
--- a/vcl/inc/dbggui.hxx
+++ b/vcl/inc/dbggui.hxx
@@ -26,11 +26,13 @@ class Window;
 
 void DbgGUIInit();
 void DbgGUIDeInit();
+void DbgGUIDeInitSolarMutexCheck();
 void DbgGUIStart();
 void DbgDialogTest( Window* pWindow );
 
 #define DBGGUI_INIT()           DbgGUIInit()
 #define DBGGUI_DEINIT()         DbgGUIDeInit()
+#define DBGGUI_DEINIT_SOLARMUTEXCHECK() DbgGUIDeInitSolarMutexCheck()
 #define DBGGUI_START()          DbgGUIStart()
 
 #define DBG_DIALOGTEST( pWindow )                   \
@@ -42,6 +44,7 @@ void DbgDialogTest( Window* pWindow );
 
 #define DBGGUI_INIT()
 #define DBGGUI_DEINIT()
+#define DBGGUI_DEINIT_SOLARMUTEXCHECK()
 #define DBGGUI_START()
 
 #define DBG_DIALOGTEST( pWindow )
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 81c32b2..cd1e54e 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -1636,13 +1636,17 @@ void DbgGUIDeInit()
 {
     DbgSetPrintMsgBox( NULL );
     DbgSetPrintWindow( NULL );
-    DbgSetTestSolarMutex( NULL );
     DbgSetAbort( NULL );
 
     DbgWindow* pDbgWindow = ImplGetSVData()->maWinData.mpDbgWin;
     delete pDbgWindow;
 }
 
+void DbgGUIDeInitSolarMutexCheck()
+{
+    DbgSetTestSolarMutex( NULL );
+}
+
 void DbgGUIStart()
 {
     DbgData* pData = DbgGetData();
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 3047488..9e1aeb8 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -453,6 +453,8 @@ void DeInitVCL()
         pSVData->mpDefaultWin = NULL;
     }
 
+    DBGGUI_DEINIT_SOLARMUTEXCHECK();
+
     if ( pSVData->mpUnoWrapper )
     {
         try