ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix last bugs when changing video settings with no game loaded

This commit is contained in:
Arisotura 2019-06-08 13:06:36 +02:00
parent bc53ff35a9
commit 8fc30d69c5
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/GPU3D_OpenGL.cpp
View File

@ -398,7 +398,6 @@ void DeInit()
void Reset() void Reset()
{ {
UpdateDisplaySettings();
} }
void UpdateDisplaySettings() void UpdateDisplaySettings()

13
src/libui_sdl/main.cpp
View File

@ -1472,14 +1472,6 @@ void OnAreaResize(uiAreaHandler* handler, uiArea* area, int width, int height)
void Run() 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; EmuRunning = 1;
RunningSomething = true; RunningSomething = true;
@ -2125,7 +2117,10 @@ void OnSetLimitFPS(uiMenuItem* item, uiWindow* window, void* blarg)
void ApplyNewSettings(int type) void ApplyNewSettings(int type)
{ {
if (!RunningSomething && type != 2) return; if (!RunningSomething)
{
if (type == 1) return;
}
int prevstatus = EmuRunning; int prevstatus = EmuRunning;
EmuRunning = 3; EmuRunning = 3;