TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 16:25:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2332 from Bloodknight/PR_DedicatedLinuxCrashFix

Browse source 
Fixes a crash that occurs on linux headless servers
This commit is contained in:
Areloch 2019-03-30 16:41:36 -05:00 • committed by GitHub
commit d636e4d4e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/windowManager/sdl/sdlWindowMgr.cpp
View file

@ -504,10 +504,12 @@ void InitWindowingSystem()
AFTER_MODULE_INIT(gfx) 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); 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())); AssertFatal(res != -1, avar("SDL error:%s", SDL_GetError()));
// By default, SDL enables text input. We disable it on initialization, and // By default, SDL enables text input. We disable it on initialization, and
// we will enable it whenever the time is right. // we will enable it whenever the time is right.
SDL_StopTextInput(); SDL_StopTextInput();
#endif
} }