Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move COMMAND_NESTING safety handler into try..except..finally clause to avoid it ticking up accidentally due to the loop exiting from a traceback.

Browse source
This commit is contained in:
Griatch 2016-09-03 22:52:29 +02:00
parent 2ed92e8149
commit 17ee28ab6c
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/commands/cmdhandler.py
View file

@ -472,7 +472,6 @@ def cmdhandler(called_by, raw_string, _testing=False, callertype="session", sess
caller.ndb.last_cmd = yield copy(cmd) caller.ndb.last_cmd = yield copy(cmd)
else: else:
caller.ndb.last_cmd = None caller.ndb.last_cmd = None
_COMMAND_NESTING[called_by] -= 1
# return result to the deferred # return result to the deferred
returnValue(ret) returnValue(ret)
@ -480,6 +479,9 @@ def cmdhandler(called_by, raw_string, _testing=False, callertype="session", sess
except Exception: except Exception:
_msg_err(caller, _ERROR_UNTRAPPED) _msg_err(caller, _ERROR_UNTRAPPED)
raise ErrorReported raise ErrorReported
finally:
_COMMAND_NESTING[called_by] -= 1
raw_string = to_unicode(raw_string, force_string=True) raw_string = to_unicode(raw_string, force_string=True)