aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 117cb29..f384476 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1392,8 +1392,13 @@ void BScreen::reassociateWindow(FluxboxWindow *w, unsigned int wkspc_id,
1392} 1392}
1393 1393
1394void BScreen::initMenus() { 1394void BScreen::initMenus() {
1395 lua::state &l = Fluxbox::instance()->lua();
1395 m_workspacemenu.reset(MenuCreator::createMenuType("workspacemenu", screenNumber())); 1396 m_workspacemenu.reset(MenuCreator::createMenuType("workspacemenu", screenNumber()));
1396 m_rootmenu->reloadHelper()->setMainFile(Fluxbox::instance()->getMenuFilename()); 1397 l.loadfile(FbTk::StringUtil::expandFilename(Fluxbox::instance()->getMenuFilename()).c_str());
1398 l.call(0, 0);
1399 l.getglobal("menu");
1400 m_rootmenu = MenuCreator::createMenu(l, 0);
1401// m_rootmenu->reloadHelper()->setMainFile(Fluxbox::instance()->getMenuFilename());
1397 m_windowmenu->reloadHelper()->setMainFile(windowMenuFilename()); 1402 m_windowmenu->reloadHelper()->setMainFile(windowMenuFilename());
1398} 1403}
1399 1404