don't allow empty root menu

This commit is contained in:
Mark Tiefenbruck 2008-04-30 03:06:31 -07:00
parent f552b328bc
commit 92d1e5fcfb
2 changed files with 4 additions and 1 deletions

View file

@ -1,5 +1,8 @@
(Format: Year/Month/Day) (Format: Year/Month/Day)
Changes for 1.0.1: Changes for 1.0.1:
*08/04/30:
* Don't allow empty root menu (Mark)
Screen.cc
*08/04/27: *08/04/27:
* Added SimpleObserver class. (Henrik) * Added SimpleObserver class. (Henrik)
SimpleObserver.hh, SendToMenu.hh/cc, Toolbar.hh/cc, SimpleObserver.hh, SendToMenu.hh/cc, Toolbar.hh/cc,

View file

@ -1522,7 +1522,7 @@ void BScreen::initMenu() {
} }
if (m_rootmenu.get() == 0) { if (m_rootmenu.get() == 0 || m_rootmenu->numberOfItems() == 0) {
_FB_USES_NLS; _FB_USES_NLS;
m_rootmenu.reset(createMenu(_FB_XTEXT(Menu, DefaultRootMenu, "Fluxbox default menu", "Title of fallback root menu"))); m_rootmenu.reset(createMenu(_FB_XTEXT(Menu, DefaultRootMenu, "Fluxbox default menu", "Title of fallback root menu")));
FbTk::RefCount<FbTk::Command<void> > restart_fb(FbTk::CommandParser<void>::instance().parse("restart")); FbTk::RefCount<FbTk::Command<void> > restart_fb(FbTk::CommandParser<void>::instance().parse("restart"));