From 231ca253f20653bb6d1b30adbecb4fca01b65179 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 18 Oct 2018 18:31:06 +0100
Subject: [PATCH 1/5] Stop electron crashing

Workaround temporarily by not closing notifs on win32 as per
comment.

Fixes https://github.com/vector-im/riot-web/issues/7512
---
 src/vector/platform/ElectronPlatform.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js
index f811192e2d..e8211fdc66 100644
--- 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 othet 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();
     }
 

From bb907d49c91c83761069874dcc3d7966eb3bf525 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 18 Oct 2018 18:35:01 +0100
Subject: [PATCH 2/5] Typo

---
 src/vector/platform/ElectronPlatform.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js
index e8211fdc66..9275a4a8ad 100644
--- a/src/vector/platform/ElectronPlatform.js
+++ b/src/vector/platform/ElectronPlatform.js
@@ -170,7 +170,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
 
     clearNotification(notif: Notification) {
         // This crashes on windows under certain circumstances: can't find any
-        // workaround othet than not closing notifs.
+        // 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;

From 2518976326f577e02e7e2e0f7d3a7683ff84eff9 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 18 Oct 2018 18:38:54 +0100
Subject: [PATCH 3/5] v0.17.1

---
 electron_app/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/electron_app/package.json b/electron_app/package.json
index 18847188d7..8adcebad9e 100644
--- 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": {

From 35147c65141c7d1c92b19ccafeebeea6be5e722d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 18 Oct 2018 18:39:58 +0100
Subject: [PATCH 4/5] Prepare changelog for v0.17.1

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49f4760feb..1b29a5c793 100644
--- 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)

From a7ea51fc3ec09811b8d3a0ad6888b0d1dfb15079 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 18 Oct 2018 18:39:58 +0100
Subject: [PATCH 5/5] v0.17.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 73f0a1d7b6..637c60a7fd 100644
--- 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": {