From c3825fff65c3ebedab678746c849e4d527b52818 Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Sun, 22 Oct 2023 17:51:00 +0200
Subject: [PATCH] fix: Actually fix dropdown default values

---
 lib/libimhex/include/hex/api/content_registry.hpp   | 2 +-
 lib/libimhex/source/api/content_registry.cpp        | 4 +++-
 plugins/builtin/source/content/settings_entries.cpp | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/libimhex/include/hex/api/content_registry.hpp b/lib/libimhex/include/hex/api/content_registry.hpp
index aa5e771ac..04e86d239 100644
--- a/lib/libimhex/include/hex/api/content_registry.hpp
+++ b/lib/libimhex/include/hex/api/content_registry.hpp
@@ -205,7 +205,7 @@ namespace hex {
                     std::vector<nlohmann::json> m_settingsValues;
                     nlohmann::json m_defaultItem;
 
-                    int m_value = 0;
+                    int m_value = -1;
                 };
                 class TextBox       : public Widget {
                 public:
diff --git a/lib/libimhex/source/api/content_registry.cpp b/lib/libimhex/source/api/content_registry.cpp
index 1662797b0..cd493789e 100644
--- a/lib/libimhex/source/api/content_registry.cpp
+++ b/lib/libimhex/source/api/content_registry.cpp
@@ -308,8 +308,10 @@ namespace hex {
             }
 
             nlohmann::json DropDown::store() {
+                if (this->m_value == -1)
+                    return this->m_defaultItem;
                 if (size_t(this->m_value) >= this->m_items.size())
-                    return nullptr;
+                    return this->m_defaultItem;
 
                 return this->m_settingsValues[this->m_value];
             }
diff --git a/plugins/builtin/source/content/settings_entries.cpp b/plugins/builtin/source/content/settings_entries.cpp
index 55bca9da1..78585dc56 100644
--- a/plugins/builtin/source/content/settings_entries.cpp
+++ b/plugins/builtin/source/content/settings_entries.cpp
@@ -237,7 +237,7 @@ namespace hex::plugin::builtin {
             languageCodes.emplace_back(languageCode);
         }
 
-        ContentRegistry::Settings::add<Widgets::DropDown>("hex.builtin.setting.interface", "", "hex.builtin.setting.interface.language", languageNames, languageCodes, LangEntry::getFallbackLanguage());
+        ContentRegistry::Settings::add<Widgets::DropDown>("hex.builtin.setting.interface", "", "hex.builtin.setting.interface.language", languageNames, languageCodes, "en-US");
 
         ContentRegistry::Settings::add<Widgets::TextBox>("hex.builtin.setting.interface", "", "hex.builtin.setting.interface.wiki_explain_language", "en");
         ContentRegistry::Settings::add<FPSWidget>("hex.builtin.setting.interface", "", "hex.builtin.setting.interface.fps");