diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2018-12-04 09:24:32 +0100 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-12-06 16:03:45 +0100 |
| commit | ef36747c186e53702e9857fddc5ddfd31b1c842b (patch) | |
| tree | 9fe4418501453a6176e49f9674328ac44dce0bec /vcl | |
| parent | b6dbe0abef3e73f0f5c06073ccb8338831bf0522 (diff) | |
tdf#121892 Guard Gtk3KDE5FilePicker::execute with SolarMutexGuard
Adhere to what gtk3's file picker does as well.
Threading is involved in Gtk3KDE5FilePickerIpc::execute().
Change-Id: I4fa0a12f46ed13ef04211cb8577e77d1db5e8eae
Reviewed-on: https://gerrit.libreoffice.org/64502
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
(cherry picked from commit 8dbe0af729c9e054135a0f41706165033441f867)
Reviewed-on: https://gerrit.libreoffice.org/64585
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx index 919328dd9d6c..8006bc37c7dc 100644 --- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx +++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx @@ -94,7 +94,11 @@ void SAL_CALL Gtk3KDE5FilePicker::setTitle(const OUString& title) m_ipc.sendCommand(Commands::SetTitle, title); } -sal_Int16 SAL_CALL Gtk3KDE5FilePicker::execute() { return m_ipc.execute(); } +sal_Int16 SAL_CALL Gtk3KDE5FilePicker::execute() +{ + SolarMutexGuard g; + return m_ipc.execute(); +} void SAL_CALL Gtk3KDE5FilePicker::setMultiSelectionMode(sal_Bool multiSelect) { |