[Scummvm-git-logs] scummvm master -> 0b7085fbeaafcbf247470e05353389e32f857f1f

[criezy]

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:
0b7085fbea SDL: Ensure that SDL is initialized before creating the window object


Commit: 0b7085fbeaafcbf247470e05353389e32f857f1f
    https://github.com/scummvm/scummvm/commit/0b7085fbeaafcbf247470e05353389e32f857f1f
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-10-11T22:45:38+01:00

Commit Message:
SDL: Ensure that SDL is initialized before creating the window object

Changed paths:
    backends/platform/maemo/maemo.cpp
    backends/platform/sdl/macosx/macosx.cpp
    backends/platform/sdl/win32/win32.cpp
    backends/platform/symbian/src/SymbianOS.cpp


diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp
index 87975b4eac..7ef8057857 100644
--- a/backends/platform/maemo/maemo.cpp
+++ b/backends/platform/maemo/maemo.cpp
@@ -52,6 +52,7 @@ void OSystem_SDL_Maemo::init() {
 	// Use an iconless window for Maemo
 	// also N900 is hit by SDL_WM_SetIcon bug (window cannot receive input)
 	// http://bugzilla.libsdl.org/show_bug.cgi?id=586
+	initSDL();
 	_window = new SdlIconlessWindow();
 
 	OSystem_POSIX::init();
diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp
index 02de2da405..49f4a2c14a 100644
--- a/backends/platform/sdl/macosx/macosx.cpp
+++ b/backends/platform/sdl/macosx/macosx.cpp
@@ -51,6 +51,7 @@ OSystem_MacOSX::~OSystem_MacOSX() {
 
 void OSystem_MacOSX::init() {
 	// Use an iconless window on OS X, as we use a nicer external icon there.
+	initSDL();
 	_window = new SdlIconlessWindow();
 
 #if defined(USE_TASKBAR)
diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp
index 1c67d0d601..468d5d15ec 100644
--- a/backends/platform/sdl/win32/win32.cpp
+++ b/backends/platform/sdl/win32/win32.cpp
@@ -66,6 +66,7 @@ void OSystem_Win32::init() {
 	_fsFactory = new WindowsFilesystemFactory();
 
 	// Create Win32 specific window
+	initSDL();
 	_window = new SdlWindow_Win32();
 
 #if defined(USE_TASKBAR)
diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index b4ec7a83a5..9f9cf6ba1e 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -66,6 +66,7 @@ OSystem_SDL_Symbian::OSystem_SDL_Symbian()
 void OSystem_SDL_Symbian::init() {
 	_RFs = &CEikonEnv::Static()->FsSession();
 	// Use iconless window: it uses the EScummVM.aif file for the icon.
+	initSDL();
 	_window = new SdlIconlessWindow();
 	_fsFactory = new SymbianFilesystemFactory();
 	OSystem_SDL::init();