From 0034503276562e271e032f6a9cc8129a2067a2aa Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Sat, 8 Nov 2008 20:15:26 +0000 Subject: [PATCH] menu closing fixes git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3455 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/menus.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/source/src/menus.cpp b/source/src/menus.cpp index 8edc3cca..c447a117 100644 --- a/source/src/menus.cpp +++ b/source/src/menus.cpp @@ -157,12 +157,11 @@ struct mitemmanual : mitem { if(action && action[0]) { - int oldstack = menustack.length(); - gmenu *oldmenu = oldstack > 0 ? menustack.last() : curmenu; + gmenu *oldmenu = curmenu; push("arg1", text); int result = execute(action); pop("arg1"); - if(result >= 0 && menustack.length() == oldstack && (oldstack > 0 ? menustack.last() : curmenu) == oldmenu) + if(result >= 0 && oldmenu == curmenu) { menuset(NULL, false); menustack.setsize(0);