[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - vcl/unx

[Libreoffice Gerrit user]

 vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 10ac2f77d40391ecfe4dd45efec344d0f7113c81
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Tue Dec 4 09:24:32 2018 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Tue Dec 18 19:57:22 2018 +0100

    tdf#121892 Guard Gtk3KDE5FilePicker::execute with SolarMutexGuard
    
    Adhere to what gtk3's file picker does as well.
    Threading is involved in Gtk3KDE5FilePickerIpc::execute().
    
    Reviewed-on: https://gerrit.libreoffice.org/64502
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    (cherry picked from commit 8dbe0af729c9e054135a0f41706165033441f867)
    
     Conflicts:
            vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
    
    Change-Id: I4fa0a12f46ed13ef04211cb8577e77d1db5e8eae
    Reviewed-on: https://gerrit.libreoffice.org/65361
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
index 66dab2918aae..75c79f9e1090 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
@@ -94,6 +94,7 @@ void SAL_CALL Gtk3KDE5FilePicker::setTitle(const OUString& title) throw (::css::
 
 sal_Int16 SAL_CALL Gtk3KDE5FilePicker::execute() throw (::css::uno::RuntimeException, ::std::exception)
 {
+    SolarMutexGuard g;
     return m_ipc.execute();
 }