[Scummvm-git-logs] scummvm master -> b0895cf7c2a6100bed73610ab9a42d57cd62d269

[Mataniko]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b0895cf7c2 BACKENDS: Fix SDL version check for SDL_EnableScreenSaver


Commit: b0895cf7c2a6100bed73610ab9a42d57cd62d269
    https://github.com/scummvm/scummvm/commit/b0895cf7c2a6100bed73610ab9a42d57cd62d269
Author: mataniko (mataniko at gmail.com)
Date: 2020-05-10T00:50:54-04:00

Commit Message:
BACKENDS: Fix SDL version check for SDL_EnableScreenSaver

Changed paths:
    backends/platform/sdl/sdl.cpp


diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 17ad54b5af..18a133ce13 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -145,9 +145,6 @@ void OSystem_SDL::init() {
 #if !SDL_VERSION_ATLEAST(2, 0, 0)
 	// Enable unicode support if possible
 	SDL_EnableUNICODE(1);
-
-	// Allow the screen to turn off
-	SDL_EnableScreenSaver();
 #endif
 
 	// Disable OS cursor
@@ -193,6 +190,8 @@ void OSystem_SDL::initBackend() {
 
 #if SDL_VERSION_ATLEAST(2, 0, 0)
 	const char *sdlDriverName = SDL_GetCurrentVideoDriver();
+	// Allow the screen to turn off
+	SDL_EnableScreenSaver();
 #else
 	const int maxNameLen = 20;
 	char sdlDriverName[maxNameLen];