diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-22 17:25:26 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-22 17:31:55 +0100 |
| commit | 54dae86076d01306ecfe74fa21d577d82332ab3a (patch) | |
| tree | d420c40c1d2090becf2586f8e06b9a420621f18f /desktop | |
| parent | da966b5e49e49beb29be5fbdb092ad36dc7fa0ff (diff) | |
~OfficeIPCThread can only be reached with pGlobalOfficeIPCThread cleared
...as only one instance of OfficeIPCThread is ever created (in
OfficeIPCThread::EnableOfficeIPCThread), which is then either assigned to
pGlobalOfficeIPCThread (if this is the first soffice instance), or
pGlobalOfficeIPCThread is left unassigned and the OfficeIPCThread instance goes
out of scope at the end of EnableOfficeIPCThread (if another soffice instance is
already running).
So mpDispatchWatcher also does not need to be cleared here, as it is only ever
accessed through pGlobalOfficeIPCThread. And thus, there is no longer a need to
lock GetMutex() here, either.
Change-Id: I56cffc43361d01d747084153f318b8488519cf9b
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 9c6fab90f105..42d89cc23962 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -653,11 +653,7 @@ OfficeIPCThread::OfficeIPCThread() : OfficeIPCThread::~OfficeIPCThread() { - ::osl::ClearableMutexGuard aGuard( GetMutex() ); - - mpDispatchWatcher.clear(); maPipe.close(); - pGlobalOfficeIPCThread.clear(); } void OfficeIPCThread::SetReady() |