chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 03:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add branch to defaultAppRoot unless release/beta build

Browse Source
This commit is contained in:
Mark Watkins 2018-06-10 01:39:19 +10:00
parent 1120836ff8
commit df8a4bfa34
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sleepyhead/SleepLib/common.cpp
View File

@ -60,6 +60,9 @@ const QString getAppName()
const QString getDefaultAppRoot() const QString getDefaultAppRoot()
{ {
QString approot = STR_AppRoot; 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; return approot;
} }

10
sleepyhead/SleepLib/preferences.cpp
View File

@ -63,16 +63,8 @@ QString GetAppRoot()
QString HomeAppRoot = settings.value("Settings/AppRoot").toString(); QString HomeAppRoot = settings.value("Settings/AppRoot").toString();
const QString desktopFolder = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
if (HomeAppRoot.isEmpty()) { if (HomeAppRoot.isEmpty()) {
HomeAppRoot = desktopFolder + "/" + getDefaultAppRoot(); HomeAppRoot = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)+"/"+getDefaultAppRoot();
const QString testing = "-Testing";
QDir dir(HomeAppRoot+testing);
if (dir.exists()) {
HomeAppRoot += testing;
}
} }
return HomeAppRoot; return HomeAppRoot;