Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-16 21:06:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into develop

Browse source
This commit is contained in:
Griatch 2017-10-27 09:19:05 +02:00
commit 2c1ebf68e3
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
evennia/utils/evmenu.py
View file

@ -426,6 +426,15 @@ class EvMenu(object):
for key, val in kwargs.iteritems():
setattr(self, key, val)
#
if self.caller.ndb._menutree:
# an evmenu already exists - we try to close it cleanly. Note that this will
# not fire the previous menu's end node.
try:
self.caller.ndb._menutree.close_menu()
except Exception:
pass
# store ourself on the object
self.caller.ndb._menutree = self
@ -441,17 +450,7 @@ class EvMenu(object):
"persistent": persistent}
calldict.update(kwargs)
try:
caller.attributes.add("_menutree_saved",
((menudata, ),
{"startnode": startnode,
"cmdset_mergetype": cmdset_mergetype,
"cmdset_priority": cmdset_priority,
"auto_quit": auto_quit, "auto_look": auto_look, "auto_help": auto_help,
"cmd_on_exit": cmd_on_exit,
"nodetext_formatter": nodetext_formatter,
"options_formatter": options_formatter,
"node_formatter": node_formatter, "input_parser": input_parser,
"persistent": persistent, }))
caller.attributes.add("_menutree_saved", (self.__class__, (menudata, ), calldict))
caller.attributes.add("_menutree_saved_startnode", (startnode, startnode_input))
except Exception as err:
caller.msg(_ERROR_PERSISTENT_SAVING.format(error=err), session=self._session)