From 9e83e2751df383c0f6fb1bcd4d68554f89a86271 Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Mon, 17 Feb 2020 00:36:10 -0300
Subject: [PATCH] Clear setrenderneeded after calling VID_CheckRenderer

---
 src/d_main.c      | 4 +++-
 src/sdl/i_video.c | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/d_main.c b/src/d_main.c
index 2ff0042fd..6616dfaa6 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1291,12 +1291,14 @@ void D_SRB2Main(void)
 	// Lactozilla: Does the render mode need to change?
 	if ((setrenderneeded != 0) && (setrenderneeded != rendermode))
 	{
+		CONS_Printf("Switching the renderer...\n");
 		needpatchflush = true;
 		needpatchrecache = true;
 		VID_CheckRenderer();
 		SCR_ChangeRendererCVars(setrenderneeded);
+		D_CheckRendererState();
+		setrenderneeded = 0;
 	}
-	D_CheckRendererState();
 
 	wipegamestate = gamestate;
 
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index 13e2423c4..7af1863ab 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -1499,7 +1499,6 @@ void VID_CheckRenderer(void)
 	{
 		I_StartupHardwareGraphics();
 		R_InitHardwareMode();
-		HWR_Switch();
 	}
 #endif
 }