Merge branch 'master' into fast-forward-hotkey

1 files changed, 7 insertions, 8 deletions

diff --git a/src/libui_sdl/DlgEmuSettings.cpp b/src/libui_sdl/DlgEmuSettings.cpp
index 7d774a0..768560d 100644
--- a/src/libui_sdl/DlgEmuSettings.cpp
+++ b/src/libui_sdl/DlgEmuSettings.cpp
@@ -37,7 +37,6 @@ bool opened;
 uiWindow* win;
 
 uiCheckbox* cbDirectBoot;
-uiCheckbox* cbThreaded3D;
 
 
 int OnCloseWindow(uiWindow* window, void* blarg)
@@ -55,14 +54,11 @@ void OnCancel(uiButton* btn, void* blarg)
 void OnOk(uiButton* btn, void* blarg)
 {
     Config::DirectBoot = uiCheckboxChecked(cbDirectBoot);
-    Config::Threaded3D = uiCheckboxChecked(cbThreaded3D);
 
     Config::Save();
 
     uiControlDestroy(uiControl(win));
     opened = false;
-
-    ApplyNewSettings(0);
 }
 
 void Open()
@@ -87,9 +83,6 @@ void Open()
 
         cbDirectBoot = uiNewCheckbox("Boot game directly");
         uiBoxAppend(in_ctrl, uiControl(cbDirectBoot), 0);
-
-        cbThreaded3D = uiNewCheckbox("Threaded 3D renderer");
-        uiBoxAppend(in_ctrl, uiControl(cbThreaded3D), 0);
     }
 
     {
@@ -110,9 +103,15 @@ void Open()
     }
 
     uiCheckboxSetChecked(cbDirectBoot, Config::DirectBoot);
-    uiCheckboxSetChecked(cbThreaded3D, Config::Threaded3D);
 
     uiControlShow(uiControl(win));
 }
 
+void Close()
+{
+    if (!opened) return;
+    uiControlDestroy(uiControl(win));
+    opened = false;
+}
+
 }