From: Samual Lenks <samual@xonotic.org>
Date: Sun, 24 Nov 2013 18:47:27 +0000 (-0500)
Subject: Check for joy_detected when displaying "Use joystick input" checkbox
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~121
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4ca4536951fa31ac9305f313e908c7c954774ee3;p=xonotic%2Fxonotic-data.pk3dir.git

Check for joy_detected when displaying "Use joystick input" checkbox
---

diff --git a/qcsrc/menu/xonotic/dialog_settings_input.c b/qcsrc/menu/xonotic/dialog_settings_input.c
index 58ab3f555..78bd1e4e8 100644
--- a/qcsrc/menu/xonotic/dialog_settings_input.c
+++ b/qcsrc/menu/xonotic/dialog_settings_input.c
@@ -49,9 +49,15 @@ void XonoticInputSettingsTab_fill(entity me)
 	me.TR(me);
 	me.TR(me);
 		if(cvar_type("joy_enable") & CVAR_TYPEFLAG_ENGINE)
+		{
 			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "joy_enable", _("Use joystick input")));
+			setDependent(e, "joy_detected", 1, 10000000);
+		}
 		else if(cvar_type("joystick") & CVAR_TYPEFLAG_ENGINE)
+		{
 			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "joystick", _("Use joystick input")));
+			setDependent(e, "joy_detected", 1, 10000000);
+		}
 		else
 		{
 			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, string_null, _("Use joystick input")));