From 8fc30d69c509d85e656b19716b3ef9f2243d3298 Mon Sep 17 00:00:00 2001
From: Arisotura <thetotalworm@gmail.com>
Date: Sat, 8 Jun 2019 13:06:36 +0200
Subject: fix last bugs when changing video settings with no game loaded

---
 src/GPU3D_OpenGL.cpp   |  1 -
 src/libui_sdl/main.cpp | 13 ++++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/GPU3D_OpenGL.cpp b/src/GPU3D_OpenGL.cpp
index 1fd266f..56e783f 100644
--- a/src/GPU3D_OpenGL.cpp
+++ b/src/GPU3D_OpenGL.cpp
@@ -398,7 +398,6 @@ void DeInit()
 
 void Reset()
 {
-    UpdateDisplaySettings();
 }
 
 void UpdateDisplaySettings()
diff --git a/src/libui_sdl/main.cpp b/src/libui_sdl/main.cpp
index ed5e80d..d606be6 100644
--- a/src/libui_sdl/main.cpp
+++ b/src/libui_sdl/main.cpp
@@ -1472,14 +1472,6 @@ void OnAreaResize(uiAreaHandler* handler, uiArea* area, int width, int height)
 
 void Run()
 {
-    if (GPU3D::Renderer != Config::_3DRenderer)
-    {
-        if (Screen_UseGL) uiGLMakeContextCurrent(GLContext);
-        GPU3D::DeInitRenderer();
-        GPU3D::InitRenderer(Screen_UseGL);
-        if (Screen_UseGL) uiGLMakeContextCurrent(NULL);
-    }
-
     EmuRunning = 1;
     RunningSomething = true;
 
@@ -2125,7 +2117,10 @@ void OnSetLimitFPS(uiMenuItem* item, uiWindow* window, void* blarg)
 
 void ApplyNewSettings(int type)
 {
-    if (!RunningSomething && type != 2) return;
+    if (!RunningSomething)
+    {
+        if (type == 1) return;
+    }
 
     int prevstatus = EmuRunning;
     EmuRunning = 3;
-- 
cgit v1.2.3