From 1b58fa7a92553d0921540cb10fc6c63c8632fbc5 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Wed, 16 Oct 2019 00:01:22 -0500
Subject: [PATCH] [UNIX layout changes] [Fix incorrect release]

---
 public/electron.js                           |  2 +-
 src/redux/actions/release_version_actions.js | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/public/electron.js b/public/electron.js
index 9f945e9..548df1a 100644
--- a/public/electron.js
+++ b/public/electron.js
@@ -35,7 +35,7 @@ const SystemIPC = require('../src/renderer/ipc/SystemIPC');
 const UpgradeIPC = require('../src/renderer/ipc/UpgradeIPC');
 
 const dimensions = {
-  height: ((os.platform() === 'darwin') ? 316 : 296) + ((os.platform() === 'win32') ? 30 : -20),
+  height: ((os.platform() === 'darwin') ? 346 : 326),
   width: 428 + ((os.platform() === 'win32') ? 40 : (os.platform() === 'darwin') ? 150 : 160),
 };
 
diff --git a/src/redux/actions/release_version_actions.js b/src/redux/actions/release_version_actions.js
index 0fe9ebd..4415098 100644
--- a/src/redux/actions/release_version_actions.js
+++ b/src/redux/actions/release_version_actions.js
@@ -53,13 +53,17 @@ export const loadReleases = () => {
   return (dispatch, getState) => {
     const dispatchActions = (locationsLookup, versionLookup)=> {
       const state = getState().relver;
-      let latestVersion = versionLookup[Constants.RELEASE_TYPES[state.Release]].length - 1;
       let release = state.Release;
+      if (release >= Constants.RELEASE_TYPES.length) {
+        release = state.ReleaseDefault;
+      }
+
+      let latestVersion = versionLookup[Constants.RELEASE_TYPES[release]].length - 1;
       let version = state.Version;
       if (versionLookup[Constants.RELEASE_TYPES[release]][0] === 'unavailable') {
         release = state.ReleaseDefault;
-        latestVersion = version = 0;
-      } else if ((version === -1) || !versionLookup[Constants.RELEASE_TYPES[state.Release]][version]) {
+        version = latestVersion = versionLookup[Constants.RELEASE_TYPES[release]].length - 1
+      } else if ((version === -1) || !versionLookup[Constants.RELEASE_TYPES[release]][version]) {
         version = latestVersion;
       }
 
@@ -137,8 +141,12 @@ export const setActiveRelease = (release, version) => {
     dispatch(setAllowMount(false));
     const relVer = getState().relver;
     const common = getState().common;
+    if (release >= Constants.RELEASE_TYPES.length) {
+      release = getState().relver.ReleaseDefault;
+      version = -1;
+    }
     const versions = relVer.VersionLookup[Constants.RELEASE_TYPES[release]];
-    dispatch(setAllowDismissDependencies(versions.length > 1));
+    dispatch(setAllowDismissDependencies(versions && (versions.length > 1)));
     dispatch(setDismissDependencies(false));
     dispatch(notifyActiveRelease(release, version));
     if (common.AppReady) {