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

List:       kde-commits
Subject:    KDE_3_0_BRANCH: kdebase/kwin
From:       Lubos Lunak <l.lunak () kde ! org>
Date:       2002-12-17 19:29:31
[Download RAW message or body]

CVS commit by lunakl: 

Backport toplevel menubar crash fix.


  M +3 -2      workspace.cpp   1.328.2.5


--- kdebase/kwin/workspace.cpp  #1.328.2.4:1.328.2.5
@@ -1390,6 +1390,7 @@ void Workspace::setActiveClient( Client*
         menubar->show();
         // do not cover a client that wants to stay on top with the desktop menu
-        if ( menubar->mainClient() == active_client->mainClient()
-             || !active_client->staysOnTop())
+        if ( active_client != NULL
+            && ( menubar->mainClient() == active_client->mainClient()
+                 || !active_client->staysOnTop()))
             menubar->raise(); // better for FocusFollowsMouse than raiseClient(menubar)
 


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