From 24c5ba89e229bd9b42a29f021bd0c287b6e34149 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Thu, 25 Aug 2022 22:09:32 -0500
Subject: [PATCH] GUI: don't rename settings

---
 src/gui/gui.h        |  4 ++--
 src/gui/settings.cpp | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/gui/gui.h b/src/gui/gui.h
index 922182769..4654851db 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -1085,7 +1085,7 @@ class FurnaceGUI {
     int roundedButtons;
     int roundedMenus;
     int loadJapanese;
-    int loadChineseSimplified;
+    int loadChinese;
     int loadChineseTraditional;
     int loadKorean;
     int fmLayout;
@@ -1204,7 +1204,7 @@ class FurnaceGUI {
       roundedButtons(1),
       roundedMenus(0),
       loadJapanese(0),
-      loadChineseSimplified(0),
+      loadChinese(0),
       loadChineseTraditional(0),
       loadKorean(0),
       fmLayout(0),
diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp
index 0e1ed3893..1e9a14457 100644
--- a/src/gui/settings.cpp
+++ b/src/gui/settings.cpp
@@ -1072,9 +1072,9 @@ void FurnaceGUI::drawSettings() {
             );
           }
 
-          bool loadChineseSimplifiedB=settings.loadChineseSimplified;
-          if (ImGui::Checkbox("Display Chinese (Simplified) characters",&loadChineseSimplifiedB)) {
-            settings.loadChineseSimplified=loadChineseSimplifiedB;
+          bool loadChineseB=settings.loadChinese;
+          if (ImGui::Checkbox("Display Chinese (Simplified) characters",&loadChineseB)) {
+            settings.loadChinese=loadChineseB;
           }
           if (ImGui::IsItemHovered()) {
             ImGui::SetTooltip(
@@ -2196,7 +2196,7 @@ void FurnaceGUI::syncSettings() {
   settings.roundedButtons=e->getConfInt("roundedButtons",1);
   settings.roundedMenus=e->getConfInt("roundedMenus",0);
   settings.loadJapanese=e->getConfInt("loadJapanese",0);
-  settings.loadChineseSimplified=e->getConfInt("loadChineseSimplified",0);
+  settings.loadChinese=e->getConfInt("loadChinese",0);
   settings.loadChineseTraditional=e->getConfInt("loadChineseTraditional",0);
   settings.loadKorean=e->getConfInt("loadKorean",0);
   settings.fmLayout=e->getConfInt("fmLayout",0);
@@ -2302,7 +2302,7 @@ void FurnaceGUI::syncSettings() {
   clampSetting(settings.roundedButtons,0,1);
   clampSetting(settings.roundedMenus,0,1);
   clampSetting(settings.loadJapanese,0,1);
-  clampSetting(settings.loadChineseSimplified,0,1);
+  clampSetting(settings.loadChinese,0,1);
   clampSetting(settings.loadChineseTraditional,0,1);
   clampSetting(settings.loadKorean,0,1);
   clampSetting(settings.fmLayout,0,6);
@@ -2443,7 +2443,7 @@ void FurnaceGUI::commitSettings() {
   e->setConf("roundedButtons",settings.roundedButtons);
   e->setConf("roundedMenus",settings.roundedMenus);
   e->setConf("loadJapanese",settings.loadJapanese);
-  e->setConf("loadChineseSimplified",settings.loadChineseSimplified);
+  e->setConf("loadChinese",settings.loadChinese);
   e->setConf("loadChineseTraditional",settings.loadChineseTraditional);
   e->setConf("loadKorean",settings.loadKorean);
   e->setConf("fmLayout",settings.fmLayout);
@@ -3093,7 +3093,7 @@ void FurnaceGUI::applyUISettings(bool updateFonts) {
     if (settings.loadJapanese) {
       range.AddRanges(ImGui::GetIO().Fonts->GetGlyphRangesJapanese());
     }
-    if (settings.loadChineseSimplified) {
+    if (settings.loadChinese) {
       range.AddRanges(ImGui::GetIO().Fonts->GetGlyphRangesChineseSimplifiedCommon());
     }
     if (settings.loadChineseTraditional) {