Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[GUI] Add new setting for disabling Joystick with iMON

  • Loading branch information...
commit 2d2e9b8706b1239bbed5269fb9b522007e4b27b0 1 parent 86bf90f
Karlson2k authored
Showing with 9 additions and 1 deletion.
  1. +7 −1 language/English/strings.po
  2. +2 −0  xbmc/settings/GUISettings.cpp
8 language/English/strings.po
View
@@ -10823,11 +10823,17 @@ msgstr ""
#empty strings from id 35010 to 35099
+#: xbmc/settings/GUISettings.cpp

unrelated change

Karlson2k Owner

That was missing in one of my previous commits.
Yes, this is really unrelated.
Needs to be removed?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
msgctxt "#35100"
msgid "Enable joystick and gamepad support"
msgstr ""
-#empty strings from id 35101 to 35499
+#: xbmc/settings/GUISettings.cpp
+msgctxt "#35101"
+msgid "Disable joystick when iMON is present"
+msgstr ""
+
+#empty strings from id 35102 to 35499
msgctxt "#35500"
msgid "Location"
2  xbmc/settings/GUISettings.cpp
View
@@ -546,6 +546,8 @@ void CGUISettings::Initialize()
#endif
#if defined(HAS_SDL_JOYSTICK)
AddBool(in, "input.enablejoystick", 35100, true);
+ AddBool(in, "input.disablejoystickwithimon", 35101, true);
+ GetSetting("input.disablejoystickwithimon")->SetVisible(false);
#endif
CSettingsCategory* net = AddCategory(SETTINGS_SYSTEM, "network", 798);
Karlson2k

That was missing in one of my previous commits.
Yes, this is really unrelated.
Needs to be removed?

Please sign in to comment.
Something went wrong with that request. Please try again.