CCMAIL: klas.kalass@gmx.de
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:
parent
336667733e
commit
7b3f3bdd3b
1 changed files with 3 additions and 2 deletions
|
@ -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();
|
||||
|
|
Loading…
Reference in a new issue