From 15b9bd47b98d8cd114a27d6c8991dc7b8591c7b9 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 22 Mar 2021 14:38:10 +0100 Subject: [PATCH] (SDL2) Fix jump to label crosses initialization of const char* video_driver --- gfx/drivers/sdl2_gfx.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gfx/drivers/sdl2_gfx.c b/gfx/drivers/sdl2_gfx.c index 800da4c54c..5083aa7210 100644 --- a/gfx/drivers/sdl2_gfx.c +++ b/gfx/drivers/sdl2_gfx.c @@ -367,8 +367,11 @@ static void *sdl2_gfx_init(const video_info_t *video, { int i; unsigned flags; - sdl2_video_t *vid = NULL; - settings_t *settings = config_get_ptr(); + sdl2_video_t *vid = NULL; + settings_t *settings = config_get_ptr(); +#if defined(HAVE_X11) || defined(HAVE_WAYLAND) + const char *video_driver = NULL; +#endif #ifdef HAVE_X11 XInitThreads(); @@ -444,7 +447,7 @@ static void *sdl2_gfx_init(const video_info_t *video, sdl2_set_handles(vid->window, RARCH_DISPLAY_OSX); #else #if defined(HAVE_X11) || defined(HAVE_WAYLAND) - const char *video_driver = SDL_GetCurrentVideoDriver(); + video_driver = SDL_GetCurrentVideoDriver(); #endif #ifdef HAVE_X11 if (strcmp(video_driver, "x11") == 0)