make sure SD is unlocked even if we fail to save

profezzorn · Jun 8, 2020 · bfef192 · bfef192
1 parent 8f0f45f
commit bfef192
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/common/current_preset.h b/common/current_preset.h
@@ -262,12 +262,7 @@ class CurrentPreset {
     }
   }
 
-  // position = 0 -> first spot
-  // position = N -> last
-  // position = -1 -> delete
-  // To duplicate, set preset_num to -1
-  void SaveAt(int position) {
-    LOCK_SD(true);
+  void SaveAtLocked(int position) {
     FileReader f, out;
     if (!OpenPresets(&f, "presets.ini")) {
       if (!UpdateINI()) CreateINI();
@@ -301,6 +296,15 @@ class CurrentPreset {
     out.Close();
     UpdateINI();
     preset_num = position;
+  }
+
+  // position = 0 -> first spot
+  // position = N -> last
+  // position = -1 -> delete
+  // To duplicate, set preset_num to -1
+  void SaveAt(int position) {
+    LOCK_SD(true);
+    SaveAtLocked(position);
     LOCK_SD(false);
   }