summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryexo <yexo@openttd.org>2009-04-28 13:16:14 +0000
committeryexo <yexo@openttd.org>2009-04-28 13:16:14 +0000
commite41886e78f4f822513a8a486d6fb4bba5309c256 (patch)
treed3039662e453f55266cb5574e3602bfa86ce6286
parent30213bf9723740436d521e07211b1494897b55b3 (diff)
downloadopenttd-e41886e78f4f822513a8a486d6fb4bba5309c256.tar.xz
(svn r16181) -Fix [Squirrel]: the traps variable wasn't restored, causing try/catch blocks to be 'forgotten' during a suspend.
-rw-r--r--src/3rdparty/squirrel/squirrel/sqvm.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/squirrel/squirrel/sqvm.cpp b/src/3rdparty/squirrel/squirrel/sqvm.cpp
index dbd9e9dd8..169bd6d4d 100644
--- a/src/3rdparty/squirrel/squirrel/sqvm.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqvm.cpp
@@ -688,6 +688,7 @@ bool SQVM::Execute(SQObjectPtr &closure, SQInteger target, SQInteger nargs, SQIn
_suspended = SQFalse;
break;
case ET_RESUME_OPENTTD:
+ traps = _suspended_traps;
_suspended = SQFalse;
break;
}