summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2019-04-16 16:48:58 +0200
committerMichael Weghorn <m.weghorn@posteo.de>2019-04-17 11:32:55 +0200
commit4640575bd33c2d1010f3acd4fdf3cce510091716 (patch)
treedaacee02cd7f26cc9d5e6b808411c57e2d563a6e
parent06eb265dd65d64b608a71cba5e5fbd906a781e1c (diff)
gtk3_kde5: No longer kill fpicker process on timeout
In some observed cases, 100 ms were not enough for the separate 'lo_kde5filepicker' process to terminate properly, in particular on slow or busy hardware. Drop the timeout here and just wait for the process to finish to avoid killing it unnecessarily, which could e.g. lead to file dialog settings/state not properly being saved by the native KDE Plasma QFileDialog (plasma-integration, e.g. in 'KDEPlatformFileDialogHelper::saveSize'), so that the last used mode or size would not be remembered. The assumption is that the separate fpicker process should now properly finish in all cases, in particular since commit 93815c2b04f1905e43c695caf5cc2c594bb897ce. Should that assumption not hold, let's rather fix the underlying issues than increasing the timeout here. Change-Id: I0a58c1425940fbfaecb5012a24fd9a0222cbaccb Reviewed-on: https://gerrit.libreoffice.org/70834 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
-rw-r--r--vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx4
1 files changed, 1 insertions, 3 deletions
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
index 044a92d06c86..6ca43ee3a78e 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
@@ -139,9 +139,7 @@ Gtk3KDE5FilePickerIpc::~Gtk3KDE5FilePickerIpc()
return;
sendCommand(Commands::Quit);
- TimeValue timeValue(std::chrono::milliseconds(100));
- if (osl_joinProcessWithTimeout(m_process, &timeValue) != osl_Process_E_None)
- osl_terminateProcess(m_process);
+ osl_joinProcess(m_process);
if (m_inputWrite)
osl_closeFile(m_inputWrite);