From 231ca253f20653bb6d1b30adbecb4fca01b65179 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 18 Oct 2018 18:31:06 +0100 Subject: [PATCH 1/2] 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 Date: Thu, 18 Oct 2018 18:35:01 +0100 Subject: [PATCH 2/2] 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;