From 6db681386dc9242d249f3dc826f7930786405019 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Sat, 8 Jul 2017 09:26:36 +0200 Subject: [PATCH] Probably fixed #127. --- resources/binaries | 2 +- resources/text/CHANGELOG | 1 + src/miscellaneous/settings.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/binaries b/resources/binaries index 1bb36a305..aea118796 160000 --- a/resources/binaries +++ b/resources/binaries @@ -1 +1 @@ -Subproject commit 1bb36a305e8a23de1e4f3609d8fc4dfeb85ba6fe +Subproject commit aea11879635d0d6b029a7f6d49d1f31dd95b3c05 diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG index 27b4fbcbf..48316edba 100644 --- a/resources/text/CHANGELOG +++ b/resources/text/CHANGELOG @@ -21,6 +21,7 @@ Changed: ▪ Tweaked some conditions for determining newly "updated" messages in ATOM format. (issue #103) Fixed: +▪ Settings and database are now stored in more standard directories on Mac OS X (#127) ▪ Fixed regression when restoring deleted messages. ▪ Crash in TT-RSS plugin on application exit, when TT-RSS user needed to be logged out. diff --git a/src/miscellaneous/settings.cpp b/src/miscellaneous/settings.cpp index 12d635d5f..d58d58bc5 100755 --- a/src/miscellaneous/settings.cpp +++ b/src/miscellaneous/settings.cpp @@ -346,7 +346,7 @@ SettingsProperties Settings::determineProperties() { // We will use PORTABLE settings only and only if it is available and NON-PORTABLE // settings was not initialized before. -#if defined (Q_OS_LINUX) +#if defined (Q_OS_LINUX) || defined (Q_OS_MACOS) // DO NOT use portable settings for Linux, it is really not used on that platform. const bool will_we_use_portable_settings = false; #else