diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-12-09 16:52:54 +0000 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2019-12-10 09:52:00 +0100 |
| commit | a678785337d5caff9354d9d3500bcd098888d7a5 (patch) | |
| tree | af346a3c865f8860a579993c3cf3f21accee673c /dbaccess | |
| parent | 1e2eb3816794117b09496be58230ceb292bc547d (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/84784
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
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 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. |