cpp/openttd-patchpack/source Changeset - r12042:8382b03cf07f

Changeset - r12042:8382b03cf07f

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

yexo - 15 years ago 2009-05-27 23:59:51
yexo@openttd.org

(svn r16454) -Fix (r16181, r16241): fix the try/catch bug fixed in r16181 and reintroduced in r16241 again, this time without breaking the regression test.

1 file changed with 10 insertions and 1 deletions:

src/3rdparty/squirrel/squirrel/sqvm.cpp

0 comments (0 inline, 0 general)

src/3rdparty/squirrel/squirrel/sqvm.cpp

➞

Show inline comments

@@ @@ -749,7 +749,16 @@ common_call: @@
 					case OT_NATIVECLOSURE: {
 						bool suspend;
 						_suspended_target = ct_target;
 						_GUARD(CallNative(_nativeclosure(clo), arg3, ct_stackbase, clo,suspend));
 						try {
 							_GUARD(CallNative(_nativeclosure(clo), arg3, ct_stackbase, clo,suspend));
 						} catch (...) {
 							_suspended = SQTrue;
 							_suspended_target = ct_target;
 							_suspended_root = ci->_root;
 							_suspended_traps = traps;
 							_suspend_varargs = ci->_vargs;
 							throw;
+						}
 						if(suspend){
 							_suspended = SQTrue;
 							_suspended_target = ct_target;

0 comments (0 inline, 0 general)