summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2011-03-01 09:01:45 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2011-03-01 09:01:45 +0000
commit08fa83bd7cda2c0fd2bc3df3cbad14427c765e23 (patch)
tree6bb06f21888d8dc3d14ed4b5c2a07d98bd09e357
parentfec3193f8a32ce4158767ee063105692cce4c1b8 (diff)
downloadrockbox-08fa83bd7cda2c0fd2bc3df3cbad14427c765e23.tar.gz
rockbox-08fa83bd7cda2c0fd2bc3df3cbad14427c765e23.zip
fix yellow
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29479 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/skin_engine/skin_touchsupport.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/gui/skin_engine/skin_touchsupport.c b/apps/gui/skin_engine/skin_touchsupport.c
index 7a2e6c922b..3206579adf 100644
--- a/apps/gui/skin_engine/skin_touchsupport.c
+++ b/apps/gui/skin_engine/skin_touchsupport.c
@@ -52,7 +52,7 @@ int skin_get_touchaction(struct wps_data *data, int* edge_offset,
52 short vx, vy; 52 short vx, vy;
53 int type = action_get_touchscreen_press(&x, &y); 53 int type = action_get_touchscreen_press(&x, &y);
54 static int last_action = ACTION_NONE; 54 static int last_action = ACTION_NONE;
55 struct touchregion *r, *temp; 55 struct touchregion *r, *temp = NULL;
56 bool repeated = (type == BUTTON_REPEAT); 56 bool repeated = (type == BUTTON_REPEAT);
57 bool released = (type == BUTTON_REL); 57 bool released = (type == BUTTON_REL);
58 bool pressed = (type == BUTTON_TOUCHSCREEN); 58 bool pressed = (type == BUTTON_TOUCHSCREEN);
@@ -119,7 +119,7 @@ int skin_get_touchaction(struct wps_data *data, int* edge_offset,
119 /* On release, all regions are disarmed. */ 119 /* On release, all regions are disarmed. */
120 if (released) 120 if (released)
121 skin_disarm_touchregions(data); 121 skin_disarm_touchregions(data);
122 if (retregion) 122 if (retregion && temp)
123 *retregion = temp; 123 *retregion = temp;
124 124
125 if (returncode != ACTION_NONE) 125 if (returncode != ACTION_NONE)