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

[Michael Weghorn (via logerrit)]

 vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 3a1d55ba036e76c47cd86ae324e2448b86c231db
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Tue Apr 16 16:48:58 2019 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Apr 17 13:02:58 2019 +0200

    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 at posteo.de>
    (cherry picked from commit 4640575bd33c2d1010f3acd4fdf3cce510091716)
    Reviewed-on: https://gerrit.libreoffice.org/70867
    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_ipc.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
index a190e522e500..f88f79ad8ffb 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
@@ -143,9 +143,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);