Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-09-22 00:55:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Weblate 2018-10-18 18:26:13 +00:00
commit deaeb1a715
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/vector/platform/ElectronPlatform.js
View File

@ -143,7 +143,6 @@ export default class ElectronPlatform extends VectorBasePlatform {
{ {
body: msg, body: msg,
icon: avatarUrl, icon: avatarUrl,
tag: 'vector',
silent: true, // we play our own sounds silent: true, // we play our own sounds
}, },
); );
@ -169,11 +168,6 @@ export default class ElectronPlatform extends VectorBasePlatform {
} }
clearNotification(notif: Notification) { 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(); notif.close();
} }