diff options
| author | Mark Tiefenbruck <mark@fluxbox.org> | 2008-04-30 10:06:31 (GMT) |
|---|---|---|
| committer | Mark Tiefenbruck <mark@fluxbox.org> | 2008-04-30 10:06:31 (GMT) |
| commit | 92d1e5fcfb5a44d6d4cfea7fdfa34bf659a377ad (patch) | |
| tree | c52860224d96d0b2dd6db13809df0cc7f9f5ff35 /src/Screen.cc | |
| parent | f552b328bc07c3b842777d5c449febb58cd817bb (diff) | |
| download | fluxbox-92d1e5fcfb5a44d6d4cfea7fdfa34bf659a377ad.zip fluxbox-92d1e5fcfb5a44d6d4cfea7fdfa34bf659a377ad.tar.bz2 | |
don't allow empty root menu
Diffstat (limited to 'src/Screen.cc')
| -rw-r--r-- | src/Screen.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index f26caee..e582b44 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
| @@ -1522,7 +1522,7 @@ void BScreen::initMenu() { | |||
| 1522 | 1522 | ||
| 1523 | } | 1523 | } |
| 1524 | 1524 | ||
| 1525 | if (m_rootmenu.get() == 0) { | 1525 | if (m_rootmenu.get() == 0 || m_rootmenu->numberOfItems() == 0) { |
| 1526 | _FB_USES_NLS; | 1526 | _FB_USES_NLS; |
| 1527 | m_rootmenu.reset(createMenu(_FB_XTEXT(Menu, DefaultRootMenu, "Fluxbox default menu", "Title of fallback root menu"))); | 1527 | m_rootmenu.reset(createMenu(_FB_XTEXT(Menu, DefaultRootMenu, "Fluxbox default menu", "Title of fallback root menu"))); |
| 1528 | FbTk::RefCount<FbTk::Command<void> > restart_fb(FbTk::CommandParser<void>::instance().parse("restart")); | 1528 | FbTk::RefCount<FbTk::Command<void> > restart_fb(FbTk::CommandParser<void>::instance().parse("restart")); |