always cycle on current desktop, even when no client was given

svn path=/trunk/KDE/kdebase/workspace/; revision=525955
icc-effect-5.14.5
Dirk Mueller 2006-04-03 13:05:47 +00:00
parent bcb3ad4ada
commit 2b87139c6b
1 changed files with 2 additions and 6 deletions

View File

@ -1149,9 +1149,7 @@ int Workspace::previousDesktopFocusChain( int iDesktop ) const
*/
Client* Workspace::nextFocusChainClient( Client* c ) const
{
if ( !c )
return 0;
int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
int desktop = !c || c->isOnAllDesktops() ? currentDesktop() : c->desktop();
if ( focus_chain[desktop].isEmpty() )
return 0;
ClientList::ConstIterator it = focus_chain[desktop].find( c );
@ -1169,9 +1167,7 @@ Client* Workspace::nextFocusChainClient( Client* c ) const
*/
Client* Workspace::previousFocusChainClient( Client* c ) const
{
if ( !c )
return 0;
int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
int desktop = !c || c->isOnAllDesktops() ? currentDesktop() : c->desktop();
if ( focus_chain[desktop].isEmpty() )
return 0;
ClientList::ConstIterator it = focus_chain[desktop].find( c );