[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/unx

[Libreoffice Gerrit user]

 vcl/unx/gtk3_kde5/kde5_filepicker.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit f8bef86cc88e99b32e223b2bd675959c6d8e46ad
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Thu Jan 31 09:52:51 2019 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Feb 1 09:32:41 2019 +0100

    tdf#123077 gtk3_kde5: Set KFileWidget's custom widget only once
    
    Since the event filter is only used to set the custom
    widget in the KFileWidget, it can and needs to be removed
    again once this has been done; which also avoids crashes.
    
    (s. https://gerrit.libreoffice.org/#/c/67185/ for more
    infos, where the same thing is done for kde5)
    
    Change-Id: I5c719fb17510916b4730ed5c00bb638df2f183e3
    Reviewed-on: https://gerrit.libreoffice.org/67184
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    (cherry picked from commit 30cc54a4532a732a0cf6dfe9943521978ff7292f)
    Reviewed-on: https://gerrit.libreoffice.org/67204
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
index 42e278aa3d0e..804aaa67e66a 100644
--- a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
+++ b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
@@ -241,7 +241,11 @@ bool KDE5FilePicker::eventFilter(QObject* o, QEvent* e)
         {
             KWindowSystem::setMainWindow(w, _winId);
             if (auto* fileWidget = w->findChild<KFileWidget*>({}, Qt::FindDirectChildrenOnly))
+            {
                 fileWidget->setCustomWidget(_extraControls);
+                // remove event filter again; the only purpose was to set the custom widget here
+                qApp->removeEventFilter(this);
+            }
         }
     }
     return QObject::eventFilter(o, e);