Merge branch 'release-v0.17.0'

dbkr · dbkr · commit ecfafc613f5d · 2018-10-18T18:43:29.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [0.17.1](https://github.com/vector-im/riot-web/releases/tag/v0.17.1) (2018-10-18)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.0...v0.17.1)
+
+ * Stop electron crashing
+   [\#7517](https://github.com/vector-im/riot-web/pull/7517)
+
 Changes in [0.17.0](https://github.com/vector-im/riot-web/releases/tag/v0.17.0) (2018-10-16)
 ============================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.0-rc.1...v0.17.0)
diff --git a/electron_app/package.json b/electron_app/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "0.17.0",
+  "version": "0.17.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.17.0",
+  "version": "0.17.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {
diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js
@@ -169,6 +169,11 @@ export default class ElectronPlatform extends VectorBasePlatform {
     }
 
     clearNotification(notif: Notification) {
+        // This crashes on windows under certain circumstances: can't find any
+        // workaround other than not closing notifs.
+        // https://github.com/electron/electron/issues/15251
+        // https://github.com/vector-im/riot-web/issues/7512
+        if (window.process.platform === 'win32') return;
         notif.close();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,11 @@ export default class ElectronPlatform extends VectorBasePlatform {`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`clearNotification(notif: Notification) {`
	`172`	`+ // This crashes on windows under certain circumstances: can't find any`
	`173`	`+ // workaround other than not closing notifs.`
	`174`	`+ // https://github.com/electron/electron/issues/15251`
	`175`	`+ // https://github.com/vector-im/riot-web/issues/7512`
	`176`	`+ if (window.process.platform === 'win32') return;`
`172`	`177`	`notif.close();`
`173`	`178`	`}`
`174`	`179`