From fa67bd50b78d9c40da01872e5529a9d1cae859e7 Mon Sep 17 00:00:00 2001 From: Alex Brazier Date: Thu, 9 Nov 2017 08:05:14 +0000 Subject: [PATCH 1/2] Attempt to fix mac build --- .travis.yml | 1 + ...lements.mac.inherit.plist => entitlements.mas.inherit.plist} | 0 build/{entitlements.mac.plist => entitlements.mas.plist} | 0 package.json | 2 +- snap/snapcraft.yaml | 2 +- 5 files changed, 3 insertions(+), 2 deletions(-) rename build/{entitlements.mac.inherit.plist => entitlements.mas.inherit.plist} (100%) rename build/{entitlements.mac.plist => entitlements.mas.plist} (100%) diff --git a/.travis.yml b/.travis.yml index c0edd7b5a2..c45e3255fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ branches: only: - master - develop + - hotfix notifications: email: diff --git a/build/entitlements.mac.inherit.plist b/build/entitlements.mas.inherit.plist similarity index 100% rename from build/entitlements.mac.inherit.plist rename to build/entitlements.mas.inherit.plist diff --git a/build/entitlements.mac.plist b/build/entitlements.mas.plist similarity index 100% rename from build/entitlements.mac.plist rename to build/entitlements.mas.plist diff --git a/package.json b/package.json index 50dd26447d..602047bffd 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "rocketchat", "productName": "Rocket.Chat+", "description": "Rocket.Chat Native Cross-Platform Desktop Application via Electron.", - "version": "2.10.0", + "version": "2.10.1", "author": "Rocket.Chat Support ", "copyright": "© 2017, Rocket.Chat", "homepage": "https://rocket.chat", diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 0e42f82fcf..73d444d53e 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: rocketchat-desktop -version: 2.10.0 +version: 2.10.1 summary: Rocket.Chat+ description: Rocket.Chat Native Cross-Platform Desktop Application via Electron. confinement: strict From 52f21b4a36a5225a520e0a56e2d61b975bb4105a Mon Sep 17 00:00:00 2001 From: Alex Brazier Date: Thu, 9 Nov 2017 10:03:48 +0000 Subject: [PATCH 2/2] Fix window state issue --- src/background/windowState.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/background/windowState.js b/src/background/windowState.js index 1821fcca33..3b1e5997d2 100644 --- a/src/background/windowState.js +++ b/src/background/windowState.js @@ -17,7 +17,7 @@ export default function (name, defaults) { try { const loadedState = userDataDir.read(stateStoreFile, 'json'); - if (loadedState != null) { + if (loadedState) { state = loadedState; } } catch (err) { @@ -41,10 +41,10 @@ export default function (name, defaults) { }; return { - get x () { return Math.floor(state.x); }, - get y () { return Math.floor(state.y); }, - get width () { return Math.floor(state.width); }, - get height () { return Math.floor(state.height); }, + get x () { return state.x && Math.floor(state.x); }, + get y () { return state.y && Math.floor(state.y); }, + get width () { return state.width && Math.floor(state.width); }, + get height () { return state.height && Math.floor(state.height); }, get isMaximized () { return state.isMaximized; }, get isMinimized () { return state.isMinimized; }, get isHidden () { return state.isHidden; },