criticial bugfix

changelog.md

@@ -1,5 +1,8 @@
 # BetterEdit 6
 
+## v6.6.2
+ * Fix bugs with <cp>auto-save</c> that made it impossible to save any new progress as well as causing levels to be duplicated and made it impossible to delete levels
+
 ## v6.6.1
  * <cj>Auto-saved changes</c> are now <co>discarded if you exit without saving</c>
  * Fix <cj>Auto-Save countdown</c> being permanently stuck on screen

mod.json

@@ -1,6 +1,6 @@
 {
 	"geode": "3.2.0",
-	"version": "6.6.1",
+	"version": "6.6.2",
 	"gd": {
 		"win": "2.206",
 		"mac": "2.206",

src/features/backups/QuickSave.cpp

@@ -100,10 +100,24 @@ class $modify(MenuLayer) {
         if (!MenuLayer::init())
             return false;
 
-        // Check if there's quicksaved crash data
-        auto files = file::readDirectory(getQuickSaveDir()).unwrapOrDefault();
-        ranges::push(files, file::readDirectory(getAutoSaveDir()).unwrapOrDefault());
-        for (auto file : files) {
+        // Only check once on startup so deleting levels doesn't become impossible
+        static bool CHECKED_CRASHDATA = false;
+        if (CHECKED_CRASHDATA) {
+            return true;
+        }
+        CHECKED_CRASHDATA = true;
+
+        restoreCrashData(getAutoSaveDir());
+
+        // Important: Load Quick Saved crash data *after* autosaved crash data, 
+        // as quick saved data is always more up-to-date
+        restoreCrashData(getQuickSaveDir());
+
+        return true;
+    }
+
+    static void restoreCrashData(std::filesystem::path const& path) {
+        for (auto file : file::readDirectory(path).unwrapOrDefault()) {
             auto data = gmd::importGmdAsLevel(file);
             if (!data) continue;
             auto imported = *data;
@@ -121,7 +135,5 @@ class $modify(MenuLayer) {
                 log::info("Restored crashed level {}", imported->m_levelName);
             }
         }
-
-        return true;
     }
 };