[patch] kicker_crash_on_exit.diff

kicker_crash_on_exit.diff (text/plain), 1.63 KB, created by Jos Delbar on 2005-07-28 07:41:57 UTC

diff -Nru kicker/ui/k_mnu.cpp kicker-new/ui/k_mnu.cpp
--- kicker/ui/k_mnu.cpp	2005-05-23 14:14:18.000000000 +0200
+++ kicker-new/ui/k_mnu.cpp	2005-07-28 16:21:07.000000000 +0200
@@ -63,6 +63,7 @@
   , bookmarkMenu(0)
   , bookmarkOwner(0)
 {
+    dynamicSubMenus.setAutoDelete(true);
     // set the first client id to some arbitrarily large value.
     client_id = 10000;
     // Don't automatically clear the main menu.
@@ -75,6 +76,7 @@
 
 PanelKMenu::~PanelKMenu()
 {
+    slotClear();
     delete bookmarkMenu;
     delete bookmarkOwner;
 }
@@ -253,7 +255,7 @@
                 {
                     insertItem(info.name(), menu);
                 }
-                subMenus.append(menu);
+                dynamicSubMenus.append(menu);
                 need_separator = true;
             }
         }
@@ -393,6 +395,17 @@
     slotClear();
 }
 
+void PanelKMenu::slotClear() 
+{ 
+    if (QApplication::closingDown())
+    {
+        return;
+    }
+
+    dynamicSubMenus.clear();
+    PanelServiceMenu::slotClear();
+}
+
 extern int kicker_screen_number;
 
 void PanelKMenu::slotLock()
diff -Nru kicker/ui/k_mnu.h kicker-new/ui/k_mnu.h
--- kicker/ui/k_mnu.h	2005-05-23 14:14:18.000000000 +0200
+++ kicker-new/ui/k_mnu.h	2005-07-28 16:21:42.000000000 +0200
@@ -67,6 +67,7 @@
     void slotRunCommand();
     void slotEditUserContact();
     void paletteChanged();
+    virtual void slotClear();
 
 protected:
     QRect sideImageRect();
@@ -89,6 +90,7 @@
     KBookmarkMenu              *bookmarkMenu;
     KActionCollection          *actionCollection;
     KBookmarkOwner             *bookmarkOwner;
+    PopupMenuList               dynamicSubMenus;
 };
 
 #endif