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

This commit is contained in:
Weblate 2018-10-18 17:44:16 +00:00
commit 1de5e61888
4 changed files with 14 additions and 2 deletions

View file

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