[Scummvm-cvs-logs] SF.net SVN: scummvm:[53512] scummvm/trunk/engines/sword25/kernel/ kernel_script.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 53512
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53512&view=rev
Author:   eriktorbjorn
Date:     2010-10-15 20:01:13 +0000 (Fri, 15 Oct 2010)

Log Message:
-----------
SWORD25: Fix infinite recursion

If I understand this, we don't need to call Kernel::GetInstance()
when we are already in the Kernel class. In this particular case,
_RegisterScriptBindings() is called from the Kernel constructor, so
it gets called again and again because _Instance hasn't yet been set.

Modified Paths:
--------------
    scummvm/trunk/engines/sword25/kernel/kernel_script.cpp

Modified: scummvm/trunk/engines/sword25/kernel/kernel_script.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/kernel_script.cpp	2010-10-15 19:24:48 UTC (rev 53511)
+++ scummvm/trunk/engines/sword25/kernel/kernel_script.cpp	2010-10-15 20:01:13 UTC (rev 53512)
@@ -723,7 +723,7 @@
 // -----------------------------------------------------------------------------
 
 bool Kernel::_RegisterScriptBindings() {
-	ScriptEngine *pScript = Kernel::GetInstance()->GetScript();
+	ScriptEngine *pScript = GetScript();
 	BS_ASSERT(pScript);
 	lua_State *L = static_cast<lua_State *>(pScript->getScriptObject());
 	BS_ASSERT(L);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.