Merge pull request #2332 from Bloodknight/PR_DedicatedLinuxCrashFix

Fixes a crash that occurs on linux headless servers
GarageGames · Mar 30, 2019 · d636e4d · d636e4d
2 parents c1dabd4 + 9820780
commit d636e4d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/Engine/source/windowManager/sdl/sdlWindowMgr.cpp b/Engine/source/windowManager/sdl/sdlWindowMgr.cpp
@@ -504,10 +504,12 @@ void InitWindowingSystem()
 
 AFTER_MODULE_INIT(gfx)
 {
+#if !defined(TORQUE_DEDICATED)
    int res = SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER | SDL_INIT_EVENTS | SDL_INIT_NOPARACHUTE);
    AssertFatal(res != -1, avar("SDL error:%s", SDL_GetError()));
 
    // By default, SDL enables text input. We disable it on initialization, and
    // we will enable it whenever the time is right.
    SDL_StopTextInput();
+#endif
 }