Merge branch 'release-v0.17.0'

pull/7518/head
David Baker 2018-10-18 18:43:29 +01:00
commit ecfafc613f
4 changed files with 14 additions and 2 deletions

View File

@ -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)

View File

@ -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": {

View File

@ -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": {

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