diff options
| author | Tor Lillqvist <tml@collabora.com> | 2018-01-02 12:21:48 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-01-10 11:42:56 +0100 |
| commit | 2d5d2c5666cd95070f17614219c3fabe9f20a370 (patch) | |
| tree | 0cc78b365d7f772085e9c436d2b7617bd716d6a9 | |
| parent | f4a97dff08468027c1d9972815aad5d85d02ce79 (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>
(cherry picked from commit de84816c1acefe0607827418f73477ff7163728d)
Reviewed-on: https://gerrit.libreoffice.org/47613
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -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 0309f91bc9da..9b56f0fb389e 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); } |