framework/source/services/autorecovery.cxx | 1 +
1 file changed, 1 insertion(+)
New commits:
commit de84816c1acefe0607827418f73477ff7163728d
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Jan 2 12:21:48 2018 +0200
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 <c...@libreoffice.org>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
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);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
