You managed to backport a nice crash to both 3.1 and 3.0 branches. It would
be nice if you posted your patches for review to kwin@kde.org next time,
especially when backporting.

svn path=/trunk/kdebase/kwin/; revision=194498
This commit is contained in:
Luboš Luňák 2002-12-17 19:27:19 +00:00
parent 336667733e
commit 7b3f3bdd3b

View file

@ -1485,8 +1485,9 @@ void Workspace::setActiveClient( Client* c )
if ( menubar ) {
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)
raiseElectricBorders();