From d5a317aefaffaf371fab3fd7a8a954505f468787 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Thu, 6 Nov 2008 05:35:36 +0000
Subject: [PATCH] menu clearing fixes

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3415 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/menus.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/src/menus.cpp b/source/src/menus.cpp
index 6f927c62..8edc3cca 100644
--- a/source/src/menus.cpp
+++ b/source/src/menus.cpp
@@ -158,10 +158,11 @@ struct mitemmanual : mitem
         if(action && action[0])
         {
             int oldstack = menustack.length();
+            gmenu *oldmenu = oldstack > 0 ? menustack.last() : curmenu;
             push("arg1", text);
             int result = execute(action);
             pop("arg1");
-            if(result >= 0 && menustack.length() <= oldstack)
+            if(result >= 0 && menustack.length() == oldstack && (oldstack > 0 ? menustack.last() : curmenu) == oldmenu)
             {
                 menuset(NULL, false);
                 menustack.setsize(0);