From 587dff0a7522014de3d3cc143a3e607214d295aa Mon Sep 17 00:00:00 2001 From: Christopher Eby Date: Sat, 31 Jul 2010 17:14:53 -0500 Subject: [PATCH] Don't crash in CoverView with song ids of -1 --- src/org/kreed/vanilla/CoverView.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/org/kreed/vanilla/CoverView.java b/src/org/kreed/vanilla/CoverView.java index e28dc89d..c34cea74 100644 --- a/src/org/kreed/vanilla/CoverView.java +++ b/src/org/kreed/vanilla/CoverView.java @@ -191,7 +191,10 @@ public final class CoverView extends View implements Handler.Callback { for (int x = 0, i = 0; i != STORE_SIZE; ++i, x += width) { if (mSongs[i] != null && clip.intersects(x, 0, x + width, height)) { - Bitmap bitmap = mBitmapCache.get((int)mSongs[i].id); + long id = mSongs[i].id; + if (id == -1) + continue; + Bitmap bitmap = mBitmapCache.get(id); if (bitmap != null) { int xOffset = (width - bitmap.getWidth()) / 2; int yOffset = (height - bitmap.getHeight()) / 2; @@ -314,7 +317,7 @@ public final class CoverView extends View implements Handler.Callback { */ private void generateBitmap(Song song) { - if (song == null) + if (song == null || song.id == -1) return; Bitmap bitmap = mBitmapCache.get(song.id);