From 594bb41a6f9a044c360b46d2b429388e4b38dbbb Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Sat, 11 Jun 2016 03:09:04 +0200 Subject: [PATCH] logic: Fixed app can't find user data after parsing CDB because working directory changed --- src/lib_gui/platform_includes/includesMac.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/lib_gui/platform_includes/includesMac.h b/src/lib_gui/platform_includes/includesMac.h index 53a33d9d..1a5b2d13 100644 --- a/src/lib_gui/platform_includes/includesMac.h +++ b/src/lib_gui/platform_includes/includesMac.h @@ -9,6 +9,8 @@ #include "qt/utility/utilityQt.h" #include "utility/UserPaths.h" +bool appIsMacBundle = false; + void setupPlatform(int argc, char *argv[]) { // ---------------------------------------------------------------------------- @@ -63,12 +65,19 @@ void setupPlatform(int argc, char *argv[]) UserPaths::setUserDataPath(dataPath.toStdString() + "/"); // ---------------------------------------------------------------------------- + + appIsMacBundle = true; } void setupApp(int argc, char *argv[]) { FilePath path(QDir::currentPath().toStdString()); AppPath::setAppPath(path.absolute().str() + "/"); + + if (!appIsMacBundle) + { + UserPaths::setUserDataPath(path.absolute().str() + "/" + UserPaths::getUserDataPath()); + } } #endif // INCLUDES_MAC_H