diff options
author | Arisotura <thetotalworm@gmail.com> | 2019-06-08 13:06:36 +0200 |
---|---|---|
committer | Arisotura <thetotalworm@gmail.com> | 2019-06-08 13:06:36 +0200 |
commit | 8fc30d69c509d85e656b19716b3ef9f2243d3298 (patch) | |
tree | 93c33afd9d6c42013c655895e9342682fc3f2011 | |
parent | bc53ff35a982e038e119599cfe326bfc723a8a67 (diff) |
fix last bugs when changing video settings with no game loaded
-rw-r--r-- | src/GPU3D_OpenGL.cpp | 1 | ||||
-rw-r--r-- | 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; |