diff options
| -rw-r--r-- | vcl/inc/dbggui.hxx | 3 | ||||
| -rw-r--r-- | vcl/source/app/dbggui.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/app/svmain.cxx | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/vcl/inc/dbggui.hxx b/vcl/inc/dbggui.hxx index b701aaa570fb..d0b0f7ae2d9f 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 81c32b247a18..cd1e54e954c9 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 3047488f4748..9e1aeb8397e0 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 |