From 9d3694ced6bd3a00ef9fca2522cf9821f945cba7 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Sun, 22 Apr 2007 08:50:24 +0000 Subject: Fix FS#7056 - dont display garbage if the viewer icon set and the main iconset have different icon heights git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13237 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/icon.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'apps/gui/icon.c') diff --git a/apps/gui/icon.c b/apps/gui/icon.c index 37eb1a715f..968d83548f 100644 --- a/apps/gui/icon.c +++ b/apps/gui/icon.c @@ -129,16 +129,11 @@ void screen_put_iconxy(struct screen * display, { icon -= Icon_Last_Themeable; if (!viewer_icons_loaded[screen] || + (global_status.viewer_icon_count*height + > viewer_iconset[screen].height) || (icon * height > viewer_iconset[screen].height)) { -#if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) - if (screen == SCREEN_REMOTE) - { - screen_put_iconxy(display, xpos, ypos, Icon_Questionmark); - return; - } -#endif - screen_clear_area(display, xpos, ypos, width, height); + screen_put_iconxy(display, xpos, ypos, Icon_Questionmark); return; } data = viewer_iconset[screen].data; -- cgit v1.2.3