From: Holger Schemel <info@artsoft.org>
Date: Wed, 23 Nov 2016 19:46:39 +0000 (+0100)
Subject: fixed displaying extra setup options for wipe gestures only if selected
X-Git-Tag: 4.0.0.0~18
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=9ab40d3dfcaf5f282d60a46a03f154fdd9c7addf;p=rocksndiamonds.git

fixed displaying extra setup options for wipe gestures only if selected
---

diff --git a/src/screens.c b/src/screens.c
index d9814948..6ece1110 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -5426,6 +5426,16 @@ static struct TokenInfo setup_info_input[] =
 };
 
 static struct TokenInfo setup_info_touch[] =
+{
+  { TYPE_ENTER_LIST,	execSetupChooseTouchControls, "Touch Control Type:" },
+  { TYPE_STRING,	&touch_controls_text,	""			},
+  { TYPE_EMPTY,		NULL,			""			},
+  { TYPE_LEAVE_MENU,	execSetupMain, 		"Back"			},
+
+  { 0,			NULL,			NULL			}
+};
+
+static struct TokenInfo setup_info_touch_wipe_gestures[] =
 {
   { TYPE_ENTER_LIST,	execSetupChooseTouchControls, "Touch Control Type:" },
   { TYPE_STRING,	&touch_controls_text,	""			},
@@ -5825,6 +5835,9 @@ static void DrawSetupScreen_Generic()
   {
     setup_info = setup_info_touch;
     title_string = "Setup Touch Ctrls";
+
+    if (strEqual(setup.touch.control_type, TOUCH_CONTROL_WIPE_GESTURES))
+      setup_info = setup_info_touch_wipe_gestures;
   }
   else if (setup_mode == SETUP_MODE_SHORTCUTS)
   {