Mercurial > sdl-ios-xcode
changeset 4124:df2f562890a0 SDL-1.2
Fixed bug #510
Oops, we were disabling the screensaver before checking SDL_VIDEO_ALLOW_SCREENSAVER
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sat, 29 Dec 2007 21:41:48 +0000 |
| parents | 9d90d7765fa7 |
| children | 21d48dbc2ca8 |
| files | src/video/x11/SDL_x11video.c |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/video/x11/SDL_x11video.c Sat Dec 29 21:31:26 2007 +0000 +++ b/src/video/x11/SDL_x11video.c Sat Dec 29 21:41:48 2007 +0000 @@ -667,6 +667,10 @@ } 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 @@ /* 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);