Merge remote-tracking branch 'origin/Applications/17.04'

9 years ago · 1a5e20e22b
parent 1658d3b64e 3b5f19fd9d
commit 1a5e20e22b
1 changed files with 1 additions and 1 deletions
--- a/shell/shell.cpp
+++ b/shell/shell.cpp
@ -497,7 +497,7 @@ void Shell::setFullScreen( bool useFullScreen )

 void Shell::showEvent(QShowEvent *e)
 {
-    if (m_showMenuBarAction)
+    if (!menuBar()->isNativeMenuBar() && m_showMenuBarAction)
        m_showMenuBarAction->setChecked( menuBar()->isVisible() );

    KParts::MainWindow::showEvent(e);