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

1a5e20e2 · Albert Astals Cid · 1658d3b6 · 3b5f19fd · 1a5e20e2
Commit 1a5e20e2 authored Jul 02, 2017 by Albert Astals Cid
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

shell/shell.cpp shell/shell.cpp +1 -1

No files found.
--- 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);