diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-12-09 16:52:54 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-12-09 20:46:06 +0100 |
| commit | 23c024e7267510c09d89be934e526d56f76ec11b (patch) | |
| tree | fc81bc41c069c9e63ff6509e8a4e13e742a62c39 /dbaccess | |
| parent | 6552ce0f510da67be02a5102016bd14957a25a85 (diff) | |
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.kaganski@collabora.com>
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/dataaccess/databasedocument.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
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. |