desktop/source/app/officeipcthread.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 9e05463f4b482a89c36159c57a80dd61474b9b9c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Mar 22 16:52:23 2016 +0100
Only access pGlobalOfficeIPCThread & mpDispatchWatcher with GetMutex locked
Change-Id: Ia8093525935b02a019bbecd81a087af54471c592
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index 3920289..9c6fab9 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -1068,6 +1068,8 @@ bool OfficeIPCThread::ExecuteCmdLineRequests(
{
pGlobalOfficeIPCThread->mpDispatchWatcher = new DispatchWatcher;
}
+ rtl::Reference<DispatchWatcher> dispatchWatcher(
+ pGlobalOfficeIPCThread->mpDispatchWatcher);
// copy for execute
std::vector<DispatchWatcher::DispatchRequest> aTempList( aDispatchList
);
@@ -1076,7 +1078,7 @@ bool OfficeIPCThread::ExecuteCmdLineRequests(
aGuard.clear();
// Execute dispatch requests
- bShutdown =
pGlobalOfficeIPCThread->mpDispatchWatcher->executeDispatchRequests( aTempList,
noTerminate);
+ bShutdown = dispatchWatcher->executeDispatchRequests( aTempList,
noTerminate);
// set processed flag
if (aRequest.pcProcessed != nullptr)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
