yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid infinite loop with empty caption.

Browse source 
CCMAIL: jowenn@kde.org
This should fix your problem, can you try again?

svn path=/trunk/kdebase/kwin/; revision=259094
This commit is contained in:
Luboš Luňák 2003-10-15 09:48:22 +00:00
parent 170cdee841
commit 5af892be88
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
client.cpp
View file

@ -1158,7 +1158,7 @@ void Client::showContextHelp()
Fetches the window's caption (WM_NAME property). It will be
stored in the client's caption().
*/
KWIN_COMPARE_PREDICATE( FetchNameInternalPredicate, QString, cl->cap_normal + cl->cap_suffix == value );
KWIN_COMPARE_PREDICATE( FetchNameInternalPredicate, const Client*, cl != value && cl->caption() == value->caption());
void Client::fetchName()
{
@ -1170,20 +1170,19 @@ void Client::fetchName()
s = KWin::readNameProperty( window(), XA_WM_NAME );
if ( s != cap_normal )
{
cap_normal = "";
cap_normal = s;
bool was_suffix = ( !cap_suffix.isEmpty());
cap_suffix = QString::null;
if ( workspace()->findClient( FetchNameInternalPredicate( s )))
if ( workspace()->findClient( FetchNameInternalPredicate( this )))
{
int i = 2;
do
{
cap_suffix = " <" + QString::number(i) + ">";
i++;
} while ( workspace()->findClient( FetchNameInternalPredicate( s + cap_suffix )));
info->setVisibleName( ( s + cap_suffix ).utf8() );
} while ( workspace()->findClient( FetchNameInternalPredicate( this )));
info->setVisibleName( caption().utf8() );
}
cap_normal = s;
if( was_suffix && cap_suffix.isEmpty())
{
info->setVisibleName( "" ); // remove