no weird desktop switching with race conditions when enabling the mac menu
svn path=/trunk/kdebase/kwin/; revision=68003
This commit is contained in:
parent
3c8525c963
commit
caf8fda461
1 changed files with 2 additions and 1 deletions
|
@ -588,7 +588,8 @@ bool Client::manage( bool isMapped, bool doNotShow, bool isInitial )
|
||||||
if ( desk <= 0 ) {
|
if ( desk <= 0 ) {
|
||||||
// assume window wants to be visible on the current desktop
|
// assume window wants to be visible on the current desktop
|
||||||
desk = workspace()->currentDesktop();
|
desk = workspace()->currentDesktop();
|
||||||
} else if ( !isMapped && !doNotShow && desk != workspace()->currentDesktop() ) {
|
} else if ( !isMapped && !doNotShow && desk != workspace()->currentDesktop()
|
||||||
|
&& !isMenu() ) {
|
||||||
//window didn't specify any specific desktop but will appear
|
//window didn't specify any specific desktop but will appear
|
||||||
//somewhere else. This happens for example with "save data?"
|
//somewhere else. This happens for example with "save data?"
|
||||||
//dialogs on shutdown. Switch to the respective desktop in
|
//dialogs on shutdown. Switch to the respective desktop in
|
||||||
|
|
Loading…
Reference in a new issue