Kaydet (Commit) de84816c authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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/47249Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarTor Lillqvist <tml@collabora.com>
üst 050c0422
...@@ -1565,6 +1565,7 @@ void SAL_CALL AutoRecovery::documentEventOccured(const css::document::DocumentEv ...@@ -1565,6 +1565,7 @@ void SAL_CALL AutoRecovery::documentEventOccured(const css::document::DocumentEv
(aEvent.EventName == EVENT_ON_SAVEASDONE) (aEvent.EventName == EVENT_ON_SAVEASDONE)
) )
{ {
SolarMutexGuard g;
implts_markDocumentAsSaved(xDocument); implts_markDocumentAsSaved(xDocument);
implts_updateDocumentUsedForSavingState(xDocument, SAVE_FINISHED); implts_updateDocumentUsedForSavingState(xDocument, SAVE_FINISHED);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment