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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Fri Nov 8 16:30:27 UTC 2019


 vcl/unx/gtk/gtksalmenu.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 04db96d9f18daa1dcc2d2be0fed766e009f8f194
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Nov 6 10:32:15 2019 +0000
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Fri Nov 8 17:29:39 2019 +0100

    set mpCloseButton to null after it is destroyed
    
    Change-Id: If1a0bec30d2bcfdf6846712a67efbe2dcfbbec5c
    Reviewed-on: https://gerrit.libreoffice.org/82134
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 91946e09fd1c..785e4457026e 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -662,7 +662,10 @@ void GtkSalMenu::ShowCloseButton(bool bShow)
     if (!bShow)
     {
         if (mpCloseButton)
+        {
             gtk_widget_destroy(mpCloseButton);
+            mpCloseButton = nullptr;
+        }
         return;
     }
 


More information about the Libreoffice-commits mailing list