Move softkey flag into json

This is not setting that controls platform backend behaviour, so it shouldn't be in its config.
cesarBLG · Aug 29, 2023 · 421f0d9 · 421f0d9
1 parent 22dc58e
commit 421f0d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/DMI/Config/config.cpp b/DMI/Config/config.cpp
@@ -12,6 +12,7 @@
 using json = nlohmann::json;
 extern int maxSpeed;
 extern int etcsDialMaxSpeed;
+extern bool softkeys;
 extern std::string stm_layout_file;
 void load_config(std::string serie)
 {
@@ -28,9 +29,12 @@ void load_config(std::string serie)
             if (cfg.contains("STMLayout")) {
                 stm_layout_file = cfg["STMLayout"];
             }
+            if (cfg.contains("SoftKeys")) {
+                softkeys = cfg["SoftKeys"];
+            }
         }
     } else {
         platform->debug_print("failed to load config.json");
     }
     maxSpeed = etcsDialMaxSpeed;
-}
+}
diff --git a/platform/sdl_platform.cpp b/platform/sdl_platform.cpp
@@ -70,8 +70,6 @@ SdlPlatform::SdlPlatform(float virtual_w, float virtual_h, const std::vector<std
 	int ypos = std::stoi(get_config("ypos", "0"));
 	bool borderless = get_config("borderless") == "true";
 	bool rotate = get_config("rotateScreen") == "true";
-	extern bool softkeys;
-	softkeys = get_config("softkeys") == "true";
 	bool ontop = get_config("alwaysOnTop") == "true";
 	bool hidecursor = get_config("hideCursor") == "true";