summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrzej Hunt <andrzej.hunt@collabora.com>2014-07-18 13:10:14 +0200
committerAndrzej Hunt <andrzej.hunt@collabora.com>2014-07-18 13:10:14 +0200
commit2ac0db5fdd203e5aab1a67ecce244d1d9ccb98d3 (patch)
treefbb861a374fb1d1226ce1f3cdcf16d91254eab9a
parent6942d9b6ae3c3a8802fadf16feacd5984f55b273 (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 93cd3393e105..eaacf81466aa 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 9c1d7518869b..8ed40fdcfcde 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -128,6 +128,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; }
};