[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - framework/source

[Tor Lillqvist]

 framework/source/services/autorecovery.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2d5d2c5666cd95070f17614219c3fabe9f20a370
Author: Tor Lillqvist <tml at 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 <ci at libreoffice.org>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    (cherry picked from commit de84816c1acefe0607827418f73477ff7163728d)
    Reviewed-on: https://gerrit.libreoffice.org/47613
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

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);
     }