Commit 1a5e20e2 authored by Albert Astals Cid's avatar Albert Astals Cid

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

parents 1658d3b6 3b5f19fd
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment