From 739cbf2e0952532f96cb74689fa5a3bc8be8eb11 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 5 Apr 2016 15:23:51 +0200 Subject: RequestHandler::Disable(join = false) is problematic ...as it causes ~RequestHandler to be called with mIpcThread still running, triggering the assert in ~RequestHandler and keeping the thread potentially still running during exit. The odd SalMainPipeExchangeSignal_impl acting upong just SIGTERM (instead of turning off the IPC thread early for each invocation of LO's signal handler, say) is effectively like that ever since ee3351d78c9b6ffbc4dfe62853e81b84e65879c7 "#89023# splash screen optimization"; just change it to use RequestHandler::SetDowning instead. Change-Id: I238476706c2463130a6ede64a062d46af953ba6f --- desktop/source/app/officeipcthread.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'desktop/source/app/officeipcthread.hxx') 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(); -- cgit