From 3fc255b4296eb867cec2fa7d6d16943ad67f0f92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 9 Jul 2016 09:15:11 +0200 Subject: [PATCH] Make it possible to run even if SDL was built with joystick disabled. Should fix #8851. --- ext/native/base/PCMain.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/ext/native/base/PCMain.cpp b/ext/native/base/PCMain.cpp index cead0d7713..00ec49a2a6 100644 --- a/ext/native/base/PCMain.cpp +++ b/ext/native/base/PCMain.cpp @@ -426,9 +426,13 @@ int main(int argc, char *argv[]) { net::Init(); + bool joystick_enabled = true; if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO) < 0) { - fprintf(stderr, "Unable to initialize SDL: %s\n", SDL_GetError()); - return 1; + joystick_enabled = false; + if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) < 0) { + fprintf(stderr, "Unable to initialize SDL: %s\n", SDL_GetError()); + return 1; + } } #ifdef __APPLE__ @@ -659,7 +663,11 @@ int main(int argc, char *argv[]) { // Audio must be unpaused _after_ NativeInit() SDL_PauseAudio(0); #ifndef _WIN32 - joystick = new SDLJoystick(); + if (joystick_enabled) { + joystick = new SDLJoystick(); + } else { + joystick = nullptr; + } #endif EnableFZ(); @@ -848,7 +856,9 @@ int main(int argc, char *argv[]) { break; default: #ifndef _WIN32 - joystick->ProcessInput(event); + if (joystick) { + joystick->ProcessInput(event); + } #endif break; }