[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdelibs/kdeui
From:       Andras Mantia <amantia () kde ! org>
Date:       2004-09-16 21:30:35
Message-ID: 20040916213035.B57F29AA6 () office ! kde ! org
[Download RAW message or body]

CVS commit by amantia: 

Backport crash fix when right clicking on a toolbar.


  M +3 -2      ktoolbar.cpp   1.386.2.3


--- kdelibs/kdeui/ktoolbar.cpp  #1.386.2.2:1.386.2.3
@@ -2081,6 +2081,7 @@ void KToolBar::slotContextAboutToShow()
       kmw->setupToolbarMenuActions();
       // Only allow hiding a toolbar if the action is also plugged somewhere else (e.g. menubar)
-      if ( kmw->toolBarMenuAction()->containerCount() > 0 )
-          kmw->toolBarMenuAction()->plug(context);
+      KAction *tbAction = kmw->toolBarMenuAction();
+      if ( tbAction && tbAction->containerCount() > 0 )
+          tbAction->plug(context);
   }
 


[prev in list] [next in list] [prev in thread] [next in thread]