Kaydet (Commit) 4640575b authored tarafından Michael Weghorn's avatar Michael Weghorn

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
93815c2b.

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: 's avatarMichael Weghorn <m.weghorn@posteo.de>
üst 06eb265d
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment