dbaccess/source/core/dataaccess/databasedocument.cxx | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 23c024e7267510c09d89be934e526d56f76ec11b
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Dec 9 16:52:54 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Dec 9 20:46:06 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/84778
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Xisco Faulí <xiscofa...@libreoffice.org>
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index c8a287cde253..2a3bc8e2a369 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.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
