diff --git a/CHANGELOG.md b/CHANGELOG.md index 300f9799..7ee93d5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [1.5.2](https://github.com/vector-im/riot-web/releases/tag/v1.5.2) (2019-11-04) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.1...v1.5.2) + + * Fix close window behaviour on Macos + [\#11311](https://github.com/vector-im/riot-web/pull/11311) + Changes in [1.5.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.1) (2019-11-04) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.1-rc.2...v1.5.1) diff --git a/electron_app/package.json b/electron_app/package.json index adf119e0..f141aa6b 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.1", + "version": "1.5.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js index 48a425c9..7e65c534 100644 --- a/electron_app/src/electron-main.js +++ b/electron_app/src/electron-main.js @@ -393,7 +393,7 @@ app.on('ready', () => { }); mainWindow.on('close', (e) => { // If we are not quitting and have a tray icon then minimize to tray - if (!global.appQuitting && tray.hasTray()) { + if (!global.appQuitting && (tray.hasTray() || process.platform === 'darwin')) { // On Mac, closing the window just hides it // (this is generally how single-window Mac apps // behave, eg. Mail.app) diff --git a/package.json b/package.json index 14e74dd0..455e4425 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.5.1", + "version": "1.5.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {