Merge pull request #310 from meetfranz/feature/touchbar-app-crash

[PR] Touch Bar app crash

3 files changed, 13 insertions, 7 deletions

diff --git a/package.json b/package.json
index f9f6ca91c..ac9c96339 100644
--- a/package.json
+++ b/package.json
@@ -65,6 +65,7 @@
     "react-sortable-hoc": "^0.6.7",
     "react-tooltip": "^3.2.7",
     "route-parser": "^0.0.5",
+    "semver": "^5.4.1",
     "smoothscroll-polyfill": "^0.3.4",
     "tar": "^4.0.2",
     "uuid": "^3.0.1"
diff --git a/src/components/ui/Subscription.js b/src/components/ui/Subscription.js
index 7f4c53d64..8bff72095 100644
--- a/src/components/ui/Subscription.js
+++ b/src/components/ui/Subscription.js
@@ -7,7 +7,6 @@ import Form from '../../lib/Form';
 import Radio from '../ui/Radio';
 import Button from '../ui/Button';
 import Loader from '../ui/Loader';
-import { isWindows } from '../../environment';
 
 import { required } from '../../helpers/validation-helpers';
 
diff --git a/src/lib/TouchBar.js b/src/lib/TouchBar.js
index ad7849b8e..97c02d194 100644
--- a/src/lib/TouchBar.js
+++ b/src/lib/TouchBar.js
@@ -1,3 +1,5 @@
+import os from 'os';
+import semver from 'semver';
 import { remote } from 'electron';
 import { autorun } from 'mobx';
 
@@ -8,17 +10,21 @@ export default class FranzTouchBar {
     this.stores = stores;
     this.actions = actions;
 
-    this._initializeReactions();
-  }
-
-  _initializeReactions() {
-    this.build = autorun(this._build.bind(this));
+    // Temporary fix for https://github.com/electron/electron/issues/10442
+    // TODO: remove when we upgrade to electron 1.8.2 or later
+    try {
+      if (isMac && semver.gt(os.release(), '16.6.0')) {
+        this.build = autorun(this._build.bind(this));
+      }
+    } catch (err) {
+      console.error(err);
+    }
   }
 
   _build() {
     const currentWindow = remote.getCurrentWindow();
 
-    if (isMac && this.stores.user.isLoggedIn) {
+    if (this.stores.user.isLoggedIn) {
       const { TouchBar } = remote;
       const { TouchBarButton, TouchBarSpacer } = TouchBar;