From 65399bf0753a791ca40ba98324dffaa4082e716a Mon Sep 17 00:00:00 2001
From: Rachael Alexanderson <eruanna@drdteam.org>
Date: Sun, 30 Apr 2017 16:35:16 -0400
Subject: [PATCH] - fixed: Added currentrenderer checks to SDL and COCOA
 implementations of 'swtruecolor'

---
 src/posix/cocoa/i_video.mm | 17 ++++++++++-------
 src/posix/sdl/hardware.cpp | 11 +++++++----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/posix/cocoa/i_video.mm b/src/posix/cocoa/i_video.mm
index cf77b250f..ed833e883 100644
--- a/src/posix/cocoa/i_video.mm
+++ b/src/posix/cocoa/i_video.mm
@@ -116,6 +116,8 @@
 
 DFrameBuffer *CreateGLSWFrameBuffer(int width, int height, bool bgra, bool fullscreen);
 
+int currentrenderer;
+
 CUSTOM_CVAR(Bool, vid_glswfb, true, CVAR_NOINITCALL | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
 {
 	Printf("This won't take effect until " GAMENAME " is restarted.\n");
@@ -135,11 +137,14 @@ CUSTOM_CVAR(Bool, swtruecolor, TRUECOLOR_DEFAULT, CVAR_ARCHIVE | CVAR_GLOBALCONF
 {
 	// Strictly speaking this doesn't require a mode switch, but it is the easiest
 	// way to force a CreateFramebuffer call without a lot of refactoring.
-	extern int NewWidth, NewHeight, NewBits, DisplayBits;
-	NewWidth      = screen->GetWidth();
-	NewHeight     = screen->GetHeight();
-	NewBits       = DisplayBits;
-	setmodeneeded = true;
+	if (currentrenderer == 0)
+	{
+		extern int NewWidth, NewHeight, NewBits, DisplayBits;
+		NewWidth      = screen->GetWidth();
+		NewHeight     = screen->GetHeight();
+		NewBits       = DisplayBits;
+		setmodeneeded = true;
+	}
 }
 
 CUSTOM_CVAR(Bool, fullscreen, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
@@ -157,8 +162,6 @@ CUSTOM_CVAR(Bool, vid_autoswitch, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_
 	Printf("You must restart " GAMENAME " to apply graphics switching mode\n");
 }
 
-int currentrenderer;
-
 CUSTOM_CVAR(Int, vid_renderer, 1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
 {
 	// 0: Software renderer
diff --git a/src/posix/sdl/hardware.cpp b/src/posix/sdl/hardware.cpp
index 580c5a1b0..20ff59325 100644
--- a/src/posix/sdl/hardware.cpp
+++ b/src/posix/sdl/hardware.cpp
@@ -323,10 +323,13 @@ CUSTOM_CVAR(Bool, swtruecolor, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_NOINITC
 {
 	// Strictly speaking this doesn't require a mode switch, but it is the easiest
 	// way to force a CreateFramebuffer call without a lot of refactoring.
-	NewWidth = screen->GetWidth();
-	NewHeight = screen->GetHeight();
-	NewBits = DisplayBits;
-	setmodeneeded = true;
+	if (currentrenderer == 0)
+	{
+		NewWidth = screen->GetWidth();
+		NewHeight = screen->GetHeight();
+		NewBits = DisplayBits;
+		setmodeneeded = true;
+	}
 }
 
 CUSTOM_CVAR (Bool, fullscreen, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)