From ce7304bba335e9750bd89092ff849a50f5bf635d Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Thu, 30 Apr 2015 00:54:43 +0000
Subject: [PATCH] Set sdl_video_initialized to FALSE after uninitializing
video.
---
src/conio/ciolib.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/conio/ciolib.c b/src/conio/ciolib.c
index f6a8226c78..118e883635 100644
--- a/src/conio/ciolib.c
+++ b/src/conio/ciolib.c
@@ -170,8 +170,10 @@ int try_sdl_init(int mode)
int try_x_init(int mode)
{
#if defined(WITH_SDL) || defined(WITH_SDL_AUDIO)
- if (sdl_video_initialized)
+ if (sdl_video_initialized) {
sdl.QuitSubSystem(SDL_INIT_VIDEO);
+ sdl_video_initialized = FALSE;
+ }
#endif
if(!x_init()) {
@@ -212,8 +214,10 @@ int try_x_init(int mode)
int try_curses_init(int mode)
{
#if defined(WITH_SDL) || defined(WITH_SDL_AUDIO)
- if (sdl_video_initialized)
+ if (sdl_video_initialized) {
sdl.QuitSubSystem(SDL_INIT_VIDEO);
+ sdl_video_initialized = FALSE;
+ }
#endif
if(curs_initciolib(mode)) {
@@ -245,8 +249,10 @@ int try_curses_init(int mode)
int try_ansi_init(int mode)
{
#if defined(WITH_SDL) || defined(WITH_SDL_AUDIO)
- if (sdl_video_initialized)
+ if (sdl_video_initialized) {
sdl.QuitSubSystem(SDL_INIT_VIDEO);
+ sdl_video_initialized = FALSE;
+ }
#endif
if(ansi_initciolib(mode)) {
@@ -274,8 +280,10 @@ int try_ansi_init(int mode)
int try_conio_init(int mode)
{
#if defined(WITH_SDL) || defined(WITH_SDL_AUDIO)
- if (sdl_video_initialized)
+ if (sdl_video_initialized) {
sdl.QuitSubSystem(SDL_INIT_VIDEO);
+ sdl_video_initialized = FALSE;
+ }
#endif
/* This should test for something or other */
--
GitLab