From d8075cbabb786140951471add7fbfb7cc1295e78 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphaelcoeffic@users.noreply.github.com>
Date: Sat, 2 Apr 2022 13:28:04 +0200
Subject: [PATCH] fix: Internal module setting and applying post load fixes on
 radio settings (#1787)

---
 radio/src/storage/sdcard_yaml.cpp    | 7 ++-----
 radio/src/storage/storage_common.cpp | 5 +++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/radio/src/storage/sdcard_yaml.cpp b/radio/src/storage/sdcard_yaml.cpp
index fdcdf2fe7..30bc69d58 100644
--- a/radio/src/storage/sdcard_yaml.cpp
+++ b/radio/src/storage/sdcard_yaml.cpp
@@ -129,15 +129,12 @@ const char * loadRadioSettings()
 #endif
     }
 
-#if defined(DEFAULT_INTERNAL_MODULE)
-    g_eeGeneral.internalModule = DEFAULT_INTERNAL_MODULE;
-#endif
-    
     const char* error = loadRadioSettingsYaml();
     if (!error) {
       g_eeGeneral.chkSum = evalChkSum();
     }
-
+    postRadioSettingsLoad();
+    
     return error;
 }
 
diff --git a/radio/src/storage/storage_common.cpp b/radio/src/storage/storage_common.cpp
index 7b6ea46fe..295395f45 100644
--- a/radio/src/storage/storage_common.cpp
+++ b/radio/src/storage/storage_common.cpp
@@ -93,6 +93,11 @@ void postRadioSettingsLoad()
     serialSetMode(SP_VCP, UART_MODE_CLI);
   }
 #endif
+#if defined(DEFAULT_INTERNAL_MODULE)
+  if (!g_eeGeneral.internalModule) {
+    g_eeGeneral.internalModule = DEFAULT_INTERNAL_MODULE;
+  }
+#endif
 }
 
 #if defined(EXTERNAL_ANTENNA) && defined(INTERNAL_MODULE_PXX1)