From e39adbd41ec60e2787e34a840afdfa1114baba19 Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Wed, 9 Sep 2020 22:03:32 -0700 Subject: [PATCH] Avoid data loss when destroying a profile that's just an empty directory; Release notes for v1.2.0-beta-2 - 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. --- Htmldocs/release_notes.html | 8 ++++++-- oscar/SleepLib/profiles.cpp | 3 +++ oscar/profileselector.cpp | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html index c8dab34e..f3eb620e 100644 --- a/Htmldocs/release_notes.html +++ b/Htmldocs/release_notes.html @@ -8,7 +8,7 @@

- Changes and fixes in OSCAR after v1.2.0-beta-1 + Changes and fixes in OSCAR v1.2.0-beta-2
Portions of OSCAR are © 2019-2020 by The OSCAR Team

+
  • [fix] Empty directories in Profiles directory are not shown in Profiles list.
    • +
  • [fix] Show correct copyright when installing Debian version.
    • +
  • [fix] Improvements to Chromebook identification.
    • +

    +

    Changes and fixes in OSCAR v1.2.0-beta-1
    Portions of OSCAR are © 2019-2020 by The OSCAR Team

    diff --git a/oscar/SleepLib/profiles.cpp b/oscar/SleepLib/profiles.cpp index e25927b5..11d80312 100644 --- a/oscar/SleepLib/profiles.cpp +++ b/oscar/SleepLib/profiles.cpp @@ -1147,6 +1147,9 @@ void Scan() // Iterate through subdirectories and load profiles.. for (auto & fi : list) { QString npath = fi.canonicalFilePath(); + QDir profilePath(npath); + if (profilePath.isEmpty()) // skip any empty folders + continue; Profile *prof = new Profile(npath); //prof->Open(); diff --git a/oscar/profileselector.cpp b/oscar/profileselector.cpp index 8db6f013..21e74648 100644 --- a/oscar/profileselector.cpp +++ b/oscar/profileselector.cpp @@ -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(); Profile * profile = Profiles::profiles[name]; 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; if (profile->user->hasPassword()) {