mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#129210 don't assert with clear on already cleared mutex

Browse Source 
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>
This commit is contained in:
Caolán McNamara 2019-12-09 16:52:54 +00:00
parent 6552ce0f51
commit 23c024e726
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dbaccess/source/core/dataaccess/databasedocument.cxx
View File

@ -685,6 +685,7 @@ void SAL_CALL ODatabaseDocument::recoverFromFile( const OUString& i_SourceLocati
aGuard.clear(); // (load has an own guarding scheme) aGuard.clear(); // (load has an own guarding scheme)
load( aMediaDescriptor.getPropertyValues() ); load( aMediaDescriptor.getPropertyValues() );
aGuard.reset();
// Without a controller, we are unable to recover the sub components, as they're always tied to a controller. // 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. // So, everything else is done when the first controller is connected.