diff options
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 6 | ||||
| -rw-r--r-- | desktop/source/app/officeipcthread.hxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 460d2c35d536..e9feb5caf483 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -300,7 +300,7 @@ void ImplPostProcessDocumentsEvent( ProcessDocumentsRequest* pEvent ) oslSignalAction SAL_CALL SalMainPipeExchangeSignal_impl(void* /*pData*/, oslSignalInfo* pInfo) { if( pInfo->Signal == osl_Signal_Terminate ) - RequestHandler::Disable(false); + RequestHandler::SetDowning(); return osl_Signal_ActCallNextHdl; } @@ -879,7 +879,7 @@ RequestHandler::Status PipeIpcThread::enable(rtl::Reference<IpcThread> * thread) } } -void RequestHandler::Disable(bool join) +void RequestHandler::Disable() { osl::ClearableMutexGuard aMutex( GetMutex() ); @@ -899,7 +899,7 @@ void RequestHandler::Disable(bool join) handler->cReady.set(); // exit gracefully and join - if (join && handler->mIpcThread.is()) + if (handler->mIpcThread.is()) { handler->mIpcThread->join(); handler->mIpcThread.clear(); diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx index 1d3b2ccd9fb8..5e8957d1c165 100644 --- a/desktop/source/app/officeipcthread.hxx +++ b/desktop/source/app/officeipcthread.hxx @@ -120,7 +120,7 @@ class RequestHandler: public salhelper::SimpleReferenceObject // return sal_False if second office static Status Enable(bool ipc); - static void Disable(bool join = true); + static void Disable(); // start dispatching events... static void SetReady(); static void WaitForReady(); |