mirror of
https://abf.rosa.ru/djam/libreoffice.git
synced 2025-02-24 02:53:02 +00:00
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
|
From de84816c1acefe0607827418f73477ff7163728d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Tor Lillqvist <tml@collabora.com>
|
||
|
|
Date: Tue, 2 Jan 2018 12:21:48 +0200
|
||
|
|
Subject: 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>
|
||
|
|
---
|
||
|
|
framework/source/services/autorecovery.cxx | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
|
||
|
|
index dd93c89..8141af1 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);
|
||
|
|
}
|
||
|
|
--
|
||
|
|
cgit v1.1
|
||
|
|
|