restore revious presetToSave in case that mutex acquisition fails

softhack007 · softhack007 · commit 91dc9a5b5a3d · 2025-12-29T21:09:04.000+01:00
diff --git a/wled00/presets.cpp b/wled00/presets.cpp
@@ -312,6 +312,7 @@ void savePreset(byte index, const char* pname, JsonObject sObj)
   }
 
   DEBUG_PRINT(F("Saving preset (")); DEBUG_PRINT(index); DEBUG_PRINT(F(") ")); DEBUG_PRINTLN(saveName);
+  auto oldpresetToSave = presetToSave; // for recovery in case that esp32SemTake(presetFileMux) fails
 
   presetToSave = index;
   playlistSave = false;
@@ -330,6 +331,7 @@ void savePreset(byte index, const char* pname, JsonObject sObj)
       // WLEDMM Acquire file mutex before writing presets.json, to prevent presets.json corruption
       if (esp32SemTake(presetFileMux, 2500) != pdTRUE) {
           USER_PRINTLN(F("savePreset(): preset file busy, cannot write"));
+          presetToSave = oldpresetToSave;
           return; // early exit, no change
       }
 

Original file line number	Diff line number	Diff line change
`@@ -312,6 +312,7 @@ void savePreset(byte index, const char* pname, JsonObject sObj)`
`312`	`312`	`}`
`313`	`313`
`314`	`314`	`DEBUG_PRINT(F("Saving preset (")); DEBUG_PRINT(index); DEBUG_PRINT(F(") ")); DEBUG_PRINTLN(saveName);`
	`315`	`+ auto oldpresetToSave = presetToSave; // for recovery in case that esp32SemTake(presetFileMux) fails`
`315`	`316`
`316`	`317`	`presetToSave = index;`
`317`	`318`	`playlistSave = false;`
`@@ -330,6 +331,7 @@ void savePreset(byte index, const char* pname, JsonObject sObj)`
`330`	`331`	`// WLEDMM Acquire file mutex before writing presets.json, to prevent presets.json corruption`
`331`	`332`	`if (esp32SemTake(presetFileMux, 2500) != pdTRUE) {`
`332`	`333`	`USER_PRINTLN(F("savePreset(): preset file busy, cannot write"));`
	`334`	`+ presetToSave = oldpresetToSave;`
`333`	`335`	`return; // early exit, no change`
`334`	`336`	`}`
`335`	`337`