[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - dbaccess/source

[Caolán McNamara (via logerrit)]

 dbaccess/source/core/dataaccess/databasedocument.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit a678785337d5caff9354d9d3500bcd098888d7a5
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Dec 9 16:52:54 2019 +0000
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Tue Dec 10 09:52:00 2019 +0100

    tdf#129210 don't assert with clear on already cleared mutex
    
    reset it after load completes, seeing as the comment suggests
    that's why the clear exists in the first place
    
    Change-Id: I3af633c5a1f99b5d0dd754c21e220c6c94b66634
    Reviewed-on: https://gerrit.libreoffice.org/84784
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 30ffe0cfadda..d5e9e43e6515 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -685,6 +685,7 @@ void SAL_CALL ODatabaseDocument::recoverFromFile( const OUString& i_SourceLocati
 
         aGuard.clear(); // (load has an own guarding scheme)
         load( aMediaDescriptor.getPropertyValues() );
+        aGuard.reset();
 
         // Without a controller, we are unable to recover the sub components, as they're always tied to a controller.
         // So, everything else is done when the first controller is connected.