From fc3094567f0d9c84ec00e5398440c3ffeacadc46 Mon Sep 17 00:00:00 2001 From: Vincent Lang Date: Fri, 18 Aug 2017 12:01:29 +0200 Subject: [PATCH] InputComponent: add a setting to disable SDL In some situations it appears that the SDL code causes issues (such as crashes), even if the user isn't using SDL. This new setting is supposed to help debugging this. A user can set main.sdlEnabled to "false", and we won't initialize and use SDL. --- resources/settings/settings_description.json | 4 ++++ src/input/InputComponent.cpp | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/resources/settings/settings_description.json b/resources/settings/settings_description.json index e636327..72d974b 100644 --- a/resources/settings/settings_description.json +++ b/resources/settings/settings_description.json @@ -151,6 +151,10 @@ "value": "forceAlwaysFS", "default": false, "hidden": true + }, + { + "value": "sdlEnabled", + "default": true } ] }, diff --git a/src/input/InputComponent.cpp b/src/input/InputComponent.cpp index 2cf5509..fc47ec1 100644 --- a/src/input/InputComponent.cpp +++ b/src/input/InputComponent.cpp @@ -91,7 +91,8 @@ bool InputComponent::componentInitialize() addInput(new InputAppleMediaKeys(this)); #endif #ifdef HAVE_SDL - addInput(new InputSDL(this)); + if (SettingsComponent::Get().value(SETTINGS_SECTION_MAIN, "sdlEnabled").toBool()) + addInput(new InputSDL(this)); #endif #ifdef HAVE_LIRC addInput(new InputLIRC(this));