diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-22 16:52:23 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-22 16:52:23 +0100 |
| commit | 9e05463f4b482a89c36159c57a80dd61474b9b9c (patch) | |
| tree | 5dbd5fb51821cd025b00cdc4fb58fef7f7d79c8a /desktop | |
| parent | 2765717bacd699bd5ed2f5bdaaa378b3e50af2a1 (diff) | |
Only access pGlobalOfficeIPCThread & mpDispatchWatcher with GetMutex locked
Change-Id: Ia8093525935b02a019bbecd81a087af54471c592
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 392028954f5d..9c6fab90f105 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) |