BlockStorage/repertory-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[UNIX layout changes] [Fix incorrect release]

Browse Source
This commit is contained in:
sgraves76
2019-10-16 00:01:22 -05:00
parent 41bf26177e
commit 1b58fa7a92
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/electron.js
View File

@@ -35,7 +35,7 @@ const SystemIPC = require('../src/renderer/ipc/SystemIPC');
const UpgradeIPC = require('../src/renderer/ipc/UpgradeIPC'); const UpgradeIPC = require('../src/renderer/ipc/UpgradeIPC');
const dimensions = { 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), width: 428 + ((os.platform() === 'win32') ? 40 : (os.platform() === 'darwin') ? 150 : 160),
}; };

16
src/redux/actions/release_version_actions.js
View File

@@ -53,13 +53,17 @@ export const loadReleases = () => {
return (dispatch, getState) => { return (dispatch, getState) => {
const dispatchActions = (locationsLookup, versionLookup)=> { const dispatchActions = (locationsLookup, versionLookup)=> {
const state = getState().relver; const state = getState().relver;
let latestVersion = versionLookup[Constants.RELEASE_TYPES[state.Release]].length - 1;
let release = state.Release; 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; let version = state.Version;
if (versionLookup[Constants.RELEASE_TYPES[release]][0] === 'unavailable') { if (versionLookup[Constants.RELEASE_TYPES[release]][0] === 'unavailable') {
release = state.ReleaseDefault; release = state.ReleaseDefault;
latestVersion = version = 0; version = latestVersion = versionLookup[Constants.RELEASE_TYPES[release]].length - 1
} else if ((version === -1) || !versionLookup[Constants.RELEASE_TYPES[state.Release]][version]) { } else if ((version === -1) || !versionLookup[Constants.RELEASE_TYPES[release]][version]) {
version = latestVersion; version = latestVersion;
} }
@@ -137,8 +141,12 @@ export const setActiveRelease = (release, version) => {
dispatch(setAllowMount(false)); dispatch(setAllowMount(false));
const relVer = getState().relver; const relVer = getState().relver;
const common = getState().common; const common = getState().common;
if (release >= Constants.RELEASE_TYPES.length) {
release = getState().relver.ReleaseDefault;
version = -1;
}
const versions = relVer.VersionLookup[Constants.RELEASE_TYPES[release]]; const versions = relVer.VersionLookup[Constants.RELEASE_TYPES[release]];
dispatch(setAllowDismissDependencies(versions.length > 1)); dispatch(setAllowDismissDependencies(versions && (versions.length > 1)));
dispatch(setDismissDependencies(false)); dispatch(setDismissDependencies(false));
dispatch(notifyActiveRelease(release, version)); dispatch(notifyActiveRelease(release, version));
if (common.AppReady) { if (common.AppReady) {