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

Avoid data loss when destroying a profile that's just an empty directory; Release notes for v1.2.0-beta-2

Browse Source 
- If trying to delete a profile folder with no contents, now displays an error message and doesn't delete it.
- Folders with no contents are no longer listed on the Profiles page.
- Release Notes updated with the fixes for beta-2.
This commit is contained in:
Guy Scharf 2020-09-09 22:03:32 -07:00
parent b49e483fa4
commit e39adbd41e
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Htmldocs/release_notes.html
View File

@ -8,7 +8,7 @@
</head> </head>
<body> <body>
<p> <p>
<b>Changes and fixes in OSCAR after v1.2.0-beta-1</b> <b>Changes and fixes in OSCAR v1.2.0-beta-2</b>
<br>Portions of OSCAR are © 2019-2020 by <br>Portions of OSCAR are © 2019-2020 by
<i>The OSCAR Team</i></p> <i>The OSCAR Team</i></p>
<ul> <ul>
@ -16,7 +16,11 @@
<li>[fix] Correct 95th percentile computations on Statistics page when some days were summary-only.</li> <li>[fix] Correct 95th percentile computations on Statistics page when some days were summary-only.</li>
<li>[fix] Improve some prompts and tooltip messages.</li> <li>[fix] Improve some prompts and tooltip messages.</li>
<li>[fix] Improve support of rare Philips Respironics 950P events and update warnings.</li> <li>[fix] Improve support of rare Philips Respironics 950P events and update warnings.</li>
</ul> <li>[fix] Empty directories in Profiles directory are not shown in Profiles list.</li>
<li>[fix] Show correct copyright when installing Debian version.</li>
<li>[fix] Improvements to Chromebook identification.</li>
</ul></p>
<p>
<b>Changes and fixes in OSCAR v1.2.0-beta-1</b> <b>Changes and fixes in OSCAR v1.2.0-beta-1</b>
<br>Portions of OSCAR are © 2019-2020 by <br>Portions of OSCAR are © 2019-2020 by
<i>The OSCAR Team</i></p> <i>The OSCAR Team</i></p>

3
oscar/SleepLib/profiles.cpp
View File

@ -1147,6 +1147,9 @@ void Scan()
// Iterate through subdirectories and load profiles.. // Iterate through subdirectories and load profiles..
for (auto & fi : list) { for (auto & fi : list) {
QString npath = fi.canonicalFilePath(); QString npath = fi.canonicalFilePath();
QDir profilePath(npath);
if (profilePath.isEmpty()) // skip any empty folders
continue;
Profile *prof = new Profile(npath); Profile *prof = new Profile(npath);
//prof->Open(); //prof->Open();

4
oscar/profileselector.cpp
View File

@ -353,6 +353,10 @@ void ProfileSelector::on_buttonDestroyProfile_clicked()
QString name = proxy->data(proxy->index(ui->profileView->currentIndex().row(), 0, QModelIndex()), Qt::UserRole+2).toString(); QString name = proxy->data(proxy->index(ui->profileView->currentIndex().row(), 0, QModelIndex()), Qt::UserRole+2).toString();
Profile * profile = Profiles::profiles[name]; Profile * profile = Profiles::profiles[name];
QString path = profile->Get(PrefMacro(STR_GEN_DataFolder)); QString path = profile->Get(PrefMacro(STR_GEN_DataFolder));
if (path == (GetAppData() + "/Profiles/")) {
QMessageBox::warning(this, STR_MessageBox_Error, tr("The selected profile does not appear to contain any data and cannot be removed by OSCAR"), QMessageBox::Ok);
return;
}
bool verified = true; bool verified = true;
if (profile->user->hasPassword()) { if (profile->user->hasPassword()) {