From bb43294f68072d7b3c2027fdfd289eeed25d10fb Mon Sep 17 00:00:00 2001
From: Patryk Obara <dreamer.tan@gmail.com>
Date: Tue, 17 Mar 2020 23:40:50 +0100
Subject: [PATCH] Store SDL texture render driver as std::string

---
 src/gui/sdlmain.cpp | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp
index 79fe6348..42c69295 100644
--- a/src/gui/sdlmain.cpp
+++ b/src/gui/sdlmain.cpp
@@ -289,9 +289,9 @@ struct SDL_Block {
 	} priority;
 	SDL_Rect clip;
 	SDL_Surface *surface;
-	SDL_Window *window;
-	SDL_Renderer *renderer;
-	const char *rendererDriver;
+	SDL_Window *window = nullptr;
+	SDL_Renderer *renderer = nullptr;
+	std::string render_driver = "";
 	int displayNumber;
 	struct {
 		SDL_Surface *input_surface = nullptr;
@@ -976,8 +976,8 @@ dosurface:
 				SCREEN_TEXTURE);
 
 		}
-		if (strcmp(sdl.rendererDriver, "auto"))
-			SDL_SetHint(SDL_HINT_RENDER_DRIVER, sdl.rendererDriver); 
+		if (sdl.render_driver != "auto")
+			SDL_SetHint(SDL_HINT_RENDER_DRIVER, sdl.render_driver.c_str());
 		sdl.renderer = SDL_CreateRenderer(sdl.window, -1,
 		                                  SDL_RENDERER_ACCELERATED |
 		                                  (sdl.desktop.vsync ? SDL_RENDERER_PRESENTVSYNC : 0));
@@ -1914,9 +1914,7 @@ static void GUI_StartUp(Section * sec) {
 
 	sdl.texture.texture = 0;
 	sdl.texture.pixelFormat = 0;
-	sdl.window = 0;
-	sdl.renderer = 0;
-	sdl.rendererDriver = section->Get_string("texture_renderer");
+	sdl.render_driver = section->Get_string("texture_renderer");
 
 #if C_OPENGL
 	if (sdl.desktop.want_type == SCREEN_OPENGL) { /* OPENGL is requested */
@@ -2396,9 +2394,7 @@ void Config_Add_SDL() {
 	Pstring->Set_help("What video system to use for output.");
 	Pstring->Set_values(outputs);
 
-	Pstring = sdl_sec->Add_string("texture_renderer",
-	                              Property::Changeable::Always,
-	                              "auto");
+	Pstring = sdl_sec->Add_string("texture_renderer", always, "auto");
 	Pstring->Set_help("Choose a renderer driver if output=texture or texturenb.\n"
 	                  "Use output=auto for an automatic choice.");
 	Pstring->Set_values(Get_SDL_TextureRenderers());