From 6cfeb1920f61f15620fa7be6431e1214efa78b72 Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 11 Nov 2009 18:13:17 +0000 Subject: (svn r18038) -Fix [FS#3290] (r17402): AIs failed to load their data from savegames by crashing them when they tried --- src/script/squirrel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/script/squirrel.cpp') diff --git a/src/script/squirrel.cpp b/src/script/squirrel.cpp index 67a927bbe..090df3304 100644 --- a/src/script/squirrel.cpp +++ b/src/script/squirrel.cpp @@ -229,7 +229,7 @@ bool Squirrel::CallMethod(HSQOBJECT instance, const char *method_name, HSQOBJECT if (ret != NULL) sq_getstackobj(vm, -1, ret); /* Reset the top, but don't do so for the AI main function, as we need * a correct stack when resuming. */ - if (suspend == -1) sq_settop(this->vm, top); + if (suspend == -1 || !this->IsSuspended()) sq_settop(this->vm, top); /* Restore the return-value location. */ this->vm->_suspended_target = last_target; -- cgit v1.2.3-54-g00ecf