fi menuuclosebug -> choosed the wrong parent-menu under some circumstances

2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index a82ad72..51199bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 (Format: Year/Month/Day)
 Changes for 0.9.10:
+*04/08/30:
+  * Fix bug in menu-closing with keys (Mathias)
+    FbTk/Menu.cc
 *04/08/29:
   * Added [wallpapers|wallpapermenu|rootcommands] to possible
     menuitems (Mathias)
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 7e89016..e03d783 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Menu.cc,v 1.77 2004/08/29 14:53:23 rathnor Exp $
+// $Id: Menu.cc,v 1.78 2004/08/30 10:23:37 akir Exp $
 
 //use GNU extensions
 #ifndef  _GNU_SOURCE
@@ -656,8 +656,9 @@ void Menu::hide() {
     if (!torn && m_parent && m_parent->isVisible()) {
         Menu *p = m_parent;
 
-        while (p->isVisible() && (! p->torn) && p->m_parent)
+        while ((! p->torn) && p->m_parent && p->m_parent->isVisible())
             p = p->m_parent;
+        
         p->internal_hide();
     } else // if we dont have a parent then do hide here
         internal_hide();
@@ -669,7 +670,6 @@ void Menu::grabInputFocus() {
 
     // grab input focus
     menu.window.setInputFocus(RevertToPointerRoot, CurrentTime);
-
 }