2 files changed, 4 insertions, 5 deletions

diff --git a/apps/plugins/sdl/src/video/rockbox/SDL_rockboxvideo.c b/apps/plugins/sdl/src/video/rockbox/SDL_rockboxvideo.c
index 2f16f3cd8b..58de15754d 100644
--- a/apps/plugins/sdl/src/video/rockbox/SDL_rockboxvideo.c
+++ b/apps/plugins/sdl/src/video/rockbox/SDL_rockboxvideo.c
@@ -669,12 +669,12 @@ static void ROCKBOX_UnlockHWSurface(_THIS, SDL_Surface *surface)
 #if LCD_PIXELFORMAT == RGB565SWAPPED
 static void flip_pixels(int x, int y, int w, int h)
 {
-    for(int y = rects[i].y; y < rects[i].y + rects[i].h; ++y)
+    for(int y_0 = y; y_0 < y + h; ++y_0)
     {
-        for(int x = rects[i].x; x < rects[i].x + rects[i].w; ++x)
+        for(int x_0 = x; x_0 < x + w; ++x_0)
         {
             /* swap pixels directly in the framebuffer */
-            rb->lcd_framebuffer[y * LCD_WIDTH + x] = swap16(rb->lcd_framebuffer[y * LCD_WIDTH + x]);
+            rb->lcd_framebuffer[y_0 * LCD_WIDTH + x_0] = swap16(rb->lcd_framebuffer[y_0 * LCD_WIDTH + x_0]);
         }
     }
 }
diff --git a/apps/plugins/sdl/src/video/rockbox/keymaps_extra.h b/apps/plugins/sdl/src/video/rockbox/keymaps_extra.h
index a205262c33..2da5c0e69d 100644
--- a/apps/plugins/sdl/src/video/rockbox/keymaps_extra.h
+++ b/apps/plugins/sdl/src/video/rockbox/keymaps_extra.h
@@ -25,8 +25,7 @@
 #ifndef _SDL_KEYMAPS_EXTRA_H
 #define _SDL_KEYMAPS_EXTRA_H
 
-#if (CONFIG_KEYPAD == GIGABEAT_PAD)      ||      \
-      (CONFIG_KEYPAD == GIGABEAT_S_PAD)
+#if (CONFIG_KEYPAD == GIGABEAT_S_PAD)
 #define BTN_EXTRA1 BUTTON_SELECT
 #define BTN_EXTRA2 BUTTON_BACK
 #define BTN_EXTRA3 BUTTON_VOL_DOWN