From c39a06eac075e904395bc796d5523cec14745661 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Thu, 8 Apr 2021 18:51:26 +0200
Subject: [PATCH] place defaults after wiping storage

---
 radio/src/storage/sdcard_common.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/radio/src/storage/sdcard_common.cpp b/radio/src/storage/sdcard_common.cpp
index 7be087043..641e68df4 100644
--- a/radio/src/storage/sdcard_common.cpp
+++ b/radio/src/storage/sdcard_common.cpp
@@ -43,9 +43,6 @@ void storageEraseAll(bool warn)
   static_cast<OpenTxTheme*>(theme)->load();
 #endif
 
-  generalDefault();
-  modelDefault(1);
-
   if (warn) {
     ALERT(STR_STORAGE_WARNING, STR_BAD_RADIO_DATA, AU_BAD_RADIODATA);
   }
@@ -54,6 +51,10 @@ void storageEraseAll(bool warn)
 
   storageFormat();
   storageDirty(EE_GENERAL|EE_MODEL);
+
+  generalDefault();
+  modelDefault(1);
+
   storageCheck(true);
 }
 
@@ -68,7 +69,7 @@ void storageCheck(bool immediately)
 {
   if (storageDirtyMsk & EE_GENERAL) {
     TRACE("eeprom write general");
-    storageDirtyMsk -= EE_GENERAL;
+    storageDirtyMsk &= ~EE_GENERAL;
     const char * error = writeGeneralSettings();
     if (error) {
       TRACE("writeGeneralSettings error=%s", error);
@@ -77,7 +78,7 @@ void storageCheck(bool immediately)
 
   if (storageDirtyMsk & EE_MODEL) {
     TRACE("eeprom write model");
-    storageDirtyMsk -= EE_MODEL;
+    storageDirtyMsk &= ~EE_MODEL;
     const char * error = writeModel();
     if (error) {
       TRACE("writeModel error=%s", error);