diff options
Diffstat (limited to 'src/Screen.cc')
-rw-r--r-- | src/Screen.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 8ce0528..4492092 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -1384,8 +1384,13 @@ void BScreen::reassociateWindow(FluxboxWindow *w, unsigned int wkspc_id, | |||
1384 | } | 1384 | } |
1385 | 1385 | ||
1386 | void BScreen::initMenus() { | 1386 | void BScreen::initMenus() { |
1387 | lua::state &l = Fluxbox::instance()->lua(); | ||
1387 | m_workspacemenu.reset(MenuCreator::createMenuType("workspacemenu", screenNumber())); | 1388 | m_workspacemenu.reset(MenuCreator::createMenuType("workspacemenu", screenNumber())); |
1388 | m_rootmenu->reloadHelper()->setMainFile(Fluxbox::instance()->getMenuFilename()); | 1389 | l.loadfile(FbTk::StringUtil::expandFilename(Fluxbox::instance()->getMenuFilename()).c_str()); |
1390 | l.call(0, 0); | ||
1391 | l.getglobal("menu"); | ||
1392 | m_rootmenu = MenuCreator::createMenu(l, 0); | ||
1393 | // m_rootmenu->reloadHelper()->setMainFile(Fluxbox::instance()->getMenuFilename()); | ||
1389 | m_windowmenu->reloadHelper()->setMainFile(windowMenuFilename()); | 1394 | m_windowmenu->reloadHelper()->setMainFile(windowMenuFilename()); |
1390 | } | 1395 | } |
1391 | 1396 | ||