[Libreoffice-commits] core.git: vcl/unx

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Oct 9 13:36:59 UTC 2018


 vcl/unx/gtk3/gtk3gtkinst.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit b0a0a3dddb9dc46c07b334eeba3f92df662563be
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Oct 9 11:21:53 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Oct 9 15:36:35 2018 +0200

    bodge not needed when it has an entry
    
    Change-Id: I790703790e49bd9e5b4ad0d5f357681f56db5121
    Reviewed-on: https://gerrit.libreoffice.org/61582
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index bd4fa42195a5..e1f51ee53424 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -5009,6 +5009,8 @@ public:
     {
         if (get_frozen())
             return;
+        if (has_entry())
+            return;
 #if defined(GDK_WINDOWING_WAYLAND)
         GdkDisplay *pDisplay = gtk_widget_get_display(m_pWidget);
         if (GDK_IS_WAYLAND_DISPLAY(pDisplay))


More information about the Libreoffice-commits mailing list