[Libreoffice-commits] .: Branch 'feature/unitymenus-quantal' - vcl/unx

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sat Oct 6 07:00:37 PDT 2012


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

New commits:
commit dcbb294362cbfb30721defd2096896ed579fa564
Author: Antonio Fernandez <antonio.fernandez at aentos.es>
Date:   Sat Oct 6 14:59:47 2012 +0100

    Fixed a crash on non-Unity WM.
    
    Change-Id: Ia8f82024e56ad83c8979d60df3c94e8209fe2552

diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx
index 3e2664e..65ee72b 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -401,7 +401,8 @@ GtkSalMenu::~GtkSalMenu()
 {
     SolarMutexGuard aGuard;
     if ( mbMenuBar == sal_True )
-        ((GtkSalFrame*) mpFrame)->SetMenu( NULL );
+        if ( mpFrame )
+            ((GtkSalFrame*) mpFrame)->SetMenu( NULL );
 
     maItems.clear();
 }


More information about the Libreoffice-commits mailing list