summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrzej Hunt <andrzej.hunt@collabora.com>2014-07-18 13:10:14 +0200
committerAndrzej Hunt <andrzej@ahunt.org>2014-08-19 14:04:58 +0200
commit292e207cbd4a19fe333b13b954ec595e3371131f (patch)
tree7196199f61dd30b7616acc8514c86dedc2ec8815
parent00c402ad68e4ec51027481bf32ed2f777a15383e (diff)
Add OfficeIPCThread::IsEnabled.
This lets us easily check whether Desktop::Main has shut down, i.e. which happens on the first restart-requiring initialisation. Change-Id: I7fe5699a4bf59e2c3b891ac73abd9b147773d22e
-rw-r--r--desktop/source/app/officeipcthread.cxx5
-rw-r--r--desktop/source/app/officeipcthread.hxx1
2 files changed, 6 insertions, 0 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 79b8f92f6ccd..15c64ae937f8 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -681,6 +681,11 @@ void OfficeIPCThread::WaitForReady(
}
}
+bool OfficeIPCThread::IsEnabled()
+{
+ return pGlobalOfficeIPCThread.is();
+}
+
void OfficeIPCThread::execute()
{
#if HAVE_FEATURE_DESKTOP
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx
index 9b3f1fd705da..a6b48c1925c6 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -129,6 +129,7 @@ class OfficeIPCThread : public salhelper::Thread
static void WaitForReady(
rtl::Reference< OfficeIPCThread > const & pThread =
rtl::Reference< OfficeIPCThread >());
+ static bool IsEnabled();
bool AreRequestsEnabled() const { return mbRequestsEnabled && ! mbDowning; }
};