Merge branch 'master' into develop

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)

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": {

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": {

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();
     }