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

--datadir option now allows fully qualified paths on Mac, Linux.

Browse Source 
Before, fully qualified paths were supported only for Windows.
This commit is contained in:
Guy Scharf 2021-11-04 21:01:18 -07:00
parent eaf88b0d23
commit 9acd685f73
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Htmldocs/release_notes.html
View File

@ -18,6 +18,7 @@
<li>[new] Add support for new settings codes in recently manufactured 700X110 DreamStations.</li>
<li>[new] Add 95% flow limitation to Therapy Efficacy section on Statistics page.</li>
<li>[fix] Correct SleepStyle machines sometimes identified as Icon machines.</li>
<li>[fix] --datadir option now allows fully qualified paths on Mac and Linux.</li>
<li>[fix] Update copyright notices in html files.</li>
<li>[fix] Correct value display on exact data points, and near session boundaries with drift.</li>
<li>[fix] Link to translations in Credits and Release Notes html is now translated to selected language.</li>

13
oscar/main.cpp
View File

@ -366,12 +366,19 @@ int main(int argc, char *argv[]) {
exit(1);
}
} else if (args[i] == "--datadir") { // mltam's idea
QString datadir ;
QString datadir, datadirwas ;
if ((i+1) < args.size()) {
datadir = args[++i];
if (datadir.length() < 2 || datadir.at(1) != QLatin1Char(':')) // Allow a Windows drive letter (but not UNC)
datadirwas = datadir = args[++i];
bool havefullpath = false;
if (datadir.length() >= 2) {
havefullpath = (datadir.at(1) == QLatin1Char(':')) // Allow a Windows drive letter
|| (datadir.at(0) == '/') // or Linux full path
|| (datadir.at(0) == '\\');
}
if (!havefullpath)
datadir = homeDocs+datadir;
settings.setValue("Settings/AppData", datadir);
qDebug() << "--datadir" << datadirwas << "homeDocs:" << homeDocs << "appdata:" << datadir;
// force_data_dir = true;
} else {
fprintf(stderr, "Missing argument to --datadir\n");