Fix disabling of submenus that are empty.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28027 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index 4ab32e21be72b7fad0e5bf83fc5a6f8b8a925dd7..d067fa71e3e357ea35788b6146df977c10a06010 100644 (file)
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -339,8 +339,8 @@ void MenuDefinition::addWithStatusCheck(MenuItem const & i)
        }
 
        case MenuItem::Submenu: {
+               bool enabled = false;
                if (i.hasSubmenu()) {
-                       bool enabled = false;
                        for (const_iterator cit = i.submenu().begin();
                             cit != i.submenu().end(); ++cit) {
                                if ((cit->kind() == MenuItem::Command
@@ -350,13 +350,11 @@ void MenuDefinition::addWithStatusCheck(MenuItem const & i)
                                        break;
                                }
                        }
-                       if (enabled || !i.optional()) {
-                               items_.push_back(i);
-                               items_.back().status().setEnabled(enabled);
-                       }
                }
-               else
+               if (enabled || !i.optional()) {
                        items_.push_back(i);
+                       items_.back().status().setEnabled(enabled);
+               }
                break;
        }