v1.5.2

Prepare changelog for v1.5.2
v1.5.2
2019-11-04 18:30:37 +00:00 · 2019-11-04 18:30:36 +00:00 · 2019-11-04 18:27:35 +00:00 · 2019-11-04 18:25:36 +00:00 · 2019-11-04 18:23:47 +00:00
4 changed files with 10 additions and 3 deletions
--- 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)
--- 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": {
--- 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)
--- 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": {
Author	SHA1	Message	Date
RiotRobot	17027cb515	v1.5.2	2019-11-04 18:30:37 +00:00
RiotRobot	3cd7e1c18c	Prepare changelog for v1.5.2	2019-11-04 18:30:36 +00:00
RiotRobot	6f85fc9e8c	v1.5.2	2019-11-04 18:27:35 +00:00
David Baker	0401e86216	Merge pull request #11311 from vector-im/dbkr/hotfix_macos_151_2 Fix close window behaviour on Macos	2019-11-04 18:25:36 +00:00
Michael Telatynski	fbd5ffc198	Fix close window behaviour on Macos	2019-11-04 18:23:47 +00:00