(SDL2) Fix jump to label crosses initialization of const char* video_driver
This commit is contained in:
parent
aeb0781398
commit
15b9bd47b9
|
@ -367,8 +367,11 @@ static void *sdl2_gfx_init(const video_info_t *video,
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
unsigned flags;
|
unsigned flags;
|
||||||
sdl2_video_t *vid = NULL;
|
sdl2_video_t *vid = NULL;
|
||||||
settings_t *settings = config_get_ptr();
|
settings_t *settings = config_get_ptr();
|
||||||
|
#if defined(HAVE_X11) || defined(HAVE_WAYLAND)
|
||||||
|
const char *video_driver = NULL;
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_X11
|
#ifdef HAVE_X11
|
||||||
XInitThreads();
|
XInitThreads();
|
||||||
|
@ -444,7 +447,7 @@ static void *sdl2_gfx_init(const video_info_t *video,
|
||||||
sdl2_set_handles(vid->window, RARCH_DISPLAY_OSX);
|
sdl2_set_handles(vid->window, RARCH_DISPLAY_OSX);
|
||||||
#else
|
#else
|
||||||
#if defined(HAVE_X11) || defined(HAVE_WAYLAND)
|
#if defined(HAVE_X11) || defined(HAVE_WAYLAND)
|
||||||
const char *video_driver = SDL_GetCurrentVideoDriver();
|
video_driver = SDL_GetCurrentVideoDriver();
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_X11
|
#ifdef HAVE_X11
|
||||||
if (strcmp(video_driver, "x11") == 0)
|
if (strcmp(video_driver, "x11") == 0)
|
||||||
|
|
Loading…
Reference in New Issue