From df8a4bfa34592f262df9b397ffb2b7a66d82a886 Mon Sep 17 00:00:00 2001
From: Mark Watkins <mark@jedimark.net>
Date: Sun, 10 Jun 2018 01:39:19 +1000
Subject: [PATCH] Add branch to defaultAppRoot unless release/beta build

---
 sleepyhead/SleepLib/common.cpp      |  3 +++
 sleepyhead/SleepLib/preferences.cpp | 10 +---------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/sleepyhead/SleepLib/common.cpp b/sleepyhead/SleepLib/common.cpp
index 635793ee..e727e2e3 100644
--- a/sleepyhead/SleepLib/common.cpp
+++ b/sleepyhead/SleepLib/common.cpp
@@ -60,6 +60,9 @@ const QString getAppName()
 const QString getDefaultAppRoot()
 {
     QString approot = STR_AppRoot;
+    if ((GIT_BRANCH != "master") || (!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) || (ReleaseStatus.compare("rc", Qt::CaseInsensitive)==0) || (ReleaseStatus.compare("beta", Qt::CaseInsensitive)==0)))) {
+        approot += "-"+GIT_BRANCH;
+    }
     return approot;
 }
 
diff --git a/sleepyhead/SleepLib/preferences.cpp b/sleepyhead/SleepLib/preferences.cpp
index 4263c6f6..c5016296 100644
--- a/sleepyhead/SleepLib/preferences.cpp
+++ b/sleepyhead/SleepLib/preferences.cpp
@@ -63,16 +63,8 @@ QString GetAppRoot()
 
     QString HomeAppRoot = settings.value("Settings/AppRoot").toString();
 
-    const QString desktopFolder = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
-
     if (HomeAppRoot.isEmpty()) {
-        HomeAppRoot = desktopFolder + "/" + getDefaultAppRoot();
-
-        const QString testing = "-Testing";
-        QDir dir(HomeAppRoot+testing);
-        if (dir.exists()) {
-            HomeAppRoot += testing;
-        }
+        HomeAppRoot = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)+"/"+getDefaultAppRoot();
     }
 
     return HomeAppRoot;