diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-24 15:42:42 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-24 15:44:45 +0100 |
| commit | 561539e2a6b2d95bdd372462034642fbf2c72f14 (patch) | |
| tree | 5f289642a0ec10cf37038a4c2cd63cab534fefea /vcl/source/app | |
| parent | 87a1e49b5e16bbb8226286852300c5e20c000513 (diff) | |
fdo#76179: deleting mpDefaultWin causes a DBG_TESTSOLARMUTEX
...so deinit support for that only afterwards
Change-Id: I89b8014bd26aecd9da67eaddc4a8facc620bf16e
Diffstat (limited to 'vcl/source/app')
| -rw-r--r-- | vcl/source/app/dbggui.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/app/svmain.cxx | 2 |
2 files changed, 7 insertions, 1 deletions
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 |