Fix error caused by null value

Automattic · Aug 7, 2019 · 088ee2a · 088ee2a
1 parent 486f04f
commit 088ee2a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/desktop/app.js b/desktop/app.js
@@ -110,7 +110,7 @@ module.exports = function main() {
     });
 
     ipcMain.on('setAutoHideMenuBar', function(event, autoHideMenuBar) {
-      mainWindow.setAutoHideMenuBar(autoHideMenuBar);
+      mainWindow.setAutoHideMenuBar(autoHideMenuBar || false);
       mainWindow.setMenuBarVisibility(!autoHideMenuBar);
     });
 

diff --git a/lib/dialogs/settings/panels/display.jsx b/lib/dialogs/settings/panels/display.jsx
@@ -109,19 +109,18 @@ const DisplayPanel = props => {
         <Item title="Dark" slug="dark" />
       </SettingsGroup>
 
-      {isElectron &&
-        !isMacApp && (
-          <SettingsGroup
-            title="Menu Bar"
-            slug="autoHideMenuBar"
-            activeSlug={autoHideMenuBar ? 'autoHide' : ''}
-            description="When set to auto-hide, press the Alt key to toggle."
-            onChange={actions.toggleAutoHideMenuBar}
-            renderer={ToggleGroup}
-          >
-            <Item title="Hide Automatically" slug="autoHide" />
-          </SettingsGroup>
-        )}
+      {isElectron && !isMacApp && (
+        <SettingsGroup
+          title="Menu Bar"
+          slug="autoHideMenuBar"
+          activeSlug={autoHideMenuBar ? 'autoHide' : ''}
+          description="When set to auto-hide, press the Alt key to toggle."
+          onChange={actions.toggleAutoHideMenuBar}
+          renderer={ToggleGroup}
+        >
+          <Item title="Hide Automatically" slug="autoHide" />
+        </SettingsGroup>
+      )}
     </Fragment>
   );
 };