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

Deleted property svnmerge-integrated.

Browse source 
A non-void function, Chelate::equivGen was reaching the end of function
without a return value, which could cause a segmentation fault. FIXED.

svn path=/trunk/KDE/kdebase/workspace/; revision=1177875
This commit is contained in:
Rohan Ramdas Prabhu 2010-09-21 14:48:17 +00:00
parent 2aec750ebf
commit 2b40492bea
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripting/chelate.cpp
View file

@ -291,6 +291,7 @@ QScriptValue KWin::Chelate::chelationEquivGen(QScriptContext* ctx, QScriptEngine
QScriptValue KWin::Chelate::chelationCheck(QScriptContext* ctx, QScriptEngine* eng)
{
Q_UNUSED(eng)
QScriptValue key = ((ctx->callee()).data()).property("key");
if(!key.isUndefined())
@ -299,6 +300,8 @@ QScriptValue KWin::Chelate::chelationCheck(QScriptContext* ctx, QScriptEngine* e
QScriptValue callBase = scCentral.property(key.toString());
return (callBase.isFunction())?((callBase.call(scCentral)).toBool()):(callBase.toBool());
}
return eng->toScriptValue<bool>(0);
}
QScriptValue KWin::Chelate::chelationCheckGen(QScriptContext* ctx, QScriptEngine* eng)