diff options
| author | Tor Lillqvist <tml@collabora.com> | 2018-01-02 12:21:48 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-01-03 17:37:27 +0100 |
| commit | de84816c1acefe0607827418f73477ff7163728d (patch) | |
| tree | ce48b65852fe506efdf0fa5554c92faa576d6864 | |
| parent | 050c0422b9c8a859d886748ae70e99274d1d9afa (diff) | |
tdf#107039: Avoid deadlock by locking the SolarMutex early on in one place
See bug report for backtraces of the deadlocking threads.
Change-Id: I0334118e173c37b6f9596249e1e2f0d196bbab3f
Reviewed-on: https://gerrit.libreoffice.org/47249
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
| -rw-r--r-- | framework/source/services/autorecovery.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index dd93c89d10d3..8141af180cc9 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -1565,6 +1565,7 @@ void SAL_CALL AutoRecovery::documentEventOccured(const css::document::DocumentEv (aEvent.EventName == EVENT_ON_SAVEASDONE) ) { + SolarMutexGuard g; implts_markDocumentAsSaved(xDocument); implts_updateDocumentUsedForSavingState(xDocument, SAVE_FINISHED); } |