Merge pull request #6714 from spycrab/qt_fix_toolbar

Qt/ToolBar: Fix inconsistencies
dolphin-emu · Apr 29, 2018 · d8b56af · d8b56af
2 parents cad7d2c + dd6ac93
commit d8b56af
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Source/Core/DolphinQt2/Settings.cpp b/Source/Core/DolphinQt2/Settings.cpp
@@ -399,7 +399,7 @@ void Settings::SetToolBarVisible(bool visible)
 
 bool Settings::IsToolBarVisible() const
 {
-  return GetQSettings().value(QStringLiteral("toolbar/visible")).toBool();
+  return GetQSettings().value(QStringLiteral("toolbar/visible"), true).toBool();
 }
 
 void Settings::SetWidgetsLocked(bool locked)

diff --git a/Source/Core/DolphinQt2/ToolBar.cpp b/Source/Core/DolphinQt2/ToolBar.cpp
@@ -21,6 +21,7 @@ ToolBar::ToolBar(QWidget* parent) : QToolBar(parent)
   setMovable(!Settings::Instance().AreWidgetsLocked());
   setFloatable(false);
   setIconSize(ICON_SIZE);
+  setVisible(Settings::Instance().IsToolBarVisible());
 
   setWindowTitle(tr("Toolbar"));
   setObjectName(QStringLiteral("toolbar"));