Merge pull request element-hq#7518 from vector-im/dbkr/better_fix_for_windows_crashes

dbkr · web-flow · commit c1dfbd69938a · 2018-10-18T19:26:08.000+01:00
Don't set tags on notifications
diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js
@@ -143,7 +143,6 @@ export default class ElectronPlatform extends VectorBasePlatform {
             {
                 body: msg,
                 icon: avatarUrl,
-                tag: 'vector',
                 silent: true, // we play our own sounds
             },
         );
@@ -169,11 +168,6 @@ 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
`@@ -143,7 +143,6 @@ export default class ElectronPlatform extends VectorBasePlatform {`
`143`	`143`	`{`
`144`	`144`	`body: msg,`
`145`	`145`	`icon: avatarUrl,`
`146`		`- tag: 'vector',`
`147`	`146`	`silent: true, // we play our own sounds`
`148`	`147`	`},`
`149`	`148`	`);`
`@@ -169,11 +168,6 @@ export default class ElectronPlatform extends VectorBasePlatform {`
`169`	`168`	`}`
`170`	`169`
`171`	`170`	`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;`
`177`	`171`	`notif.close();`
`178`	`172`	`}`
`179`	`173`