Fixed bug #510

Oops, we were disabling the screensaver before checking SDL_VIDEO_ALLOW_SCREENSAVER
libsdl-org · Dec 29, 2007 · 31f73f2 · 31f73f2
1 parent 6fb1c7b
commit 31f73f2
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/video/x11/SDL_x11video.c b/src/video/x11/SDL_x11video.c
@@ -667,6 +667,10 @@ static int X11_VideoInit(_THIS, SDL_PixelFormat *vformat)
 	}
 	X11_SaveVidModeGamma(this);
 
+	/* Allow environment override of screensaver disable. */
+	env = SDL_getenv("SDL_VIDEO_ALLOW_SCREENSAVER");
+	this->hidden->allow_screensaver = ( (env && SDL_atoi(env)) ? 1 : 0 );
+
 	/* Save DPMS and screensaver settings */
 	X11_SaveScreenSaver(SDL_Display, &screensaver_timeout, &dpms_enabled);
 	X11_DisableScreenSaver(this, SDL_Display);
@@ -685,10 +689,6 @@ static int X11_VideoInit(_THIS, SDL_PixelFormat *vformat)
 	/* Fill in some window manager capabilities */
 	this->info.wm_available = 1;
 
-	/* Allow environment override of screensaver disable. */
-	env = SDL_getenv("SDL_VIDEO_ALLOW_SCREENSAVER");
-	this->hidden->allow_screensaver = ( (env && SDL_atoi(env)) ? 1 : 0 );
-
 	/* We're done! */
 	XFlush(SDL_Display);
 	return(0);