┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/dolphincontextmenu.cpp4
-rw-r--r--src/dolphinmainwindow.cpp2
2 files changed, 1 insertions, 5 deletions
diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 55b83c552..7edfdb285 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -322,10 +322,6 @@ void DolphinContextMenu::addShowMenubarAction(KMenu* menu)
{
KAction* showMenuBar = m_mainWindow->showMenuBarAction();
if (!m_mainWindow->menuBar()->isVisible()) {
- // TODO: it should not be necessary to uncheck the menu
- // bar action, but currently the action states don't get
- // updated if the menu is disabled
- showMenuBar->setChecked(false);
menu->addAction(showMenuBar);
menu->addSeparator();
}
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 78e5ab31c..da7f8e170 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -834,7 +834,6 @@ void DolphinMainWindow::init()
m_centralWidgetLayout->addWidget(m_tabBar);
m_centralWidgetLayout->addWidget(m_viewTab[m_tabIndex].splitter);
-
setCentralWidget(centralWidget);
setupDockWidgets();
@@ -861,6 +860,7 @@ void DolphinMainWindow::init()
resize(750, 500);
}
+ m_showMenuBar->setChecked(!menuBar()->isHidden()); // workaround for bug #171080
emit urlChanged(homeUrl);
}