Force touchscreen targets into 3x3 grid mode when entering the wps/radio if the skin hasnt set any regions

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27692 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 7 insertions, 2 deletions

diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 8b3f671e34..df00080f2c 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -633,6 +633,9 @@ static void gwps_leave_wps(void)
 #endif
     /* unhandle statusbar update delay */
     sb_skin_set_update_delay(DEFAULT_UPDATE_DELAY);
+#ifdef HAVE_TOUCHSCREEN
+    touchscreen_set_mode(global_settings.touch_mode);
+#endif
 }
 
 /*
@@ -665,10 +668,12 @@ static void gwps_enter_wps(void)
         display->clear_display();
         skin_update(gwps, SKIN_REFRESH_ALL);
 
+    }
 #ifdef HAVE_TOUCHSCREEN
-        skin_disarm_touchregions(gui_wps[i].data);
+    skin_disarm_touchregions(gui_wps[SCREEN_MAIN].data);
+    if (!gui_wps[SCREEN_MAIN].data->touchregions)
+        touchscreen_set_mode(TOUCHSCREEN_BUTTON);
 #endif
-    }
     /* force statusbar/skin update since we just cleared the whole screen */
     send_event(GUI_EVENT_ACTIONUPDATE, (void*)1);
 }