Thread safety

Change-Id: I13282ac1d6b3f1323e9056a4160301bd503ac271

1 files changed, 7 insertions, 1 deletions

diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 5662823fa59c..6bf4dc56dee1 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -666,6 +666,7 @@ OfficeIPCThread::~OfficeIPCThread()
 
 void OfficeIPCThread::SetReady()
 {
+    osl::MutexGuard g(GetMutex());
     if (pGlobalOfficeIPCThread.is())
     {
         pGlobalOfficeIPCThread->cReady.set();
@@ -674,7 +675,11 @@ void OfficeIPCThread::SetReady()
 
 void OfficeIPCThread::WaitForReady()
 {
-    rtl::Reference< OfficeIPCThread > const & t(pGlobalOfficeIPCThread);
+    rtl::Reference<OfficeIPCThread> t;
+    {
+        osl::MutexGuard g(GetMutex());
+        t =  pGlobalOfficeIPCThread;
+    }
     if (t.is())
     {
         t->cReady.wait();
@@ -683,6 +688,7 @@ void OfficeIPCThread::WaitForReady()
 
 bool OfficeIPCThread::IsEnabled()
 {
+    osl::MutexGuard g(GetMutex());
     return pGlobalOfficeIPCThread.is();
 }