2 files changed, 4 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 214eccd..6056785 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.0.1:
+*08/04/30:
+   * Don't allow empty root menu (Mark)
+     Screen.cc
 *08/04/27:
    * Added SimpleObserver class. (Henrik)
      SimpleObserver.hh, SendToMenu.hh/cc, Toolbar.hh/cc,
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() {
 
     }
 
-    if (m_rootmenu.get() == 0) {
+    if (m_rootmenu.get() == 0 || m_rootmenu->numberOfItems() == 0) {
         _FB_USES_NLS;
         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"));