[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/unx

Michael Weghorn (via logerrit) logerrit at kemper.freedesktop.org
Thu Apr 11 05:22:49 UTC 2019


 vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 62d6082f5a7a87631a4316b2107f1d8fc7e8c820
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Wed Apr 10 13:32:25 2019 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Thu Apr 11 07:22:25 2019 +0200

    tdf#124652 Guard Gtk3KDE5FolderPicker::execute with SolarMutexGuard
    
    S.a. commit 8dbe0af729c9e054135a0f41706165033441f867 which already
    did the same for Gtk3KDE5FilePicker.
    
    Change-Id: I35f837b7b8fdaebc5625ff8ea5e20b3f48a3b4ec
    Reviewed-on: https://gerrit.libreoffice.org/70519
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    (cherry picked from commit 728ee3839ea94e3391c36a847bf6b28c12ad7647)
    Reviewed-on: https://gerrit.libreoffice.org/70529
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker.cxx
index ad89374b47c7..fcfe9f51d685 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker.cxx
@@ -76,7 +76,11 @@ void SAL_CALL Gtk3KDE5FolderPicker::setTitle(const OUString& aTitle)
     m_ipc.sendCommand(Commands::SetTitle, aTitle);
 }
 
-sal_Int16 SAL_CALL Gtk3KDE5FolderPicker::execute() { return m_ipc.execute(); }
+sal_Int16 SAL_CALL Gtk3KDE5FolderPicker::execute()
+{
+    SolarMutexGuard g;
+    return m_ipc.execute();
+}
 
 // XCancellable
 


More information about the Libreoffice-commits mailing list