Merge branch 'master' of https://github.com/daneren2005/Subsonic.git

1 files changed, 5 insertions, 1 deletions

diff --git a/subsonic-android/src/github/daneren2005/dsub/util/ImageLoader.java b/subsonic-android/src/github/daneren2005/dsub/util/ImageLoader.java
index 8c037468..dcf4b389 100644
--- a/subsonic-android/src/github/daneren2005/dsub/util/ImageLoader.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/ImageLoader.java
@@ -147,7 +147,11 @@ public class ImageLoader implements Runnable {
 
                 Drawable existingDrawable = imageView.getDrawable();
                 if (existingDrawable == null) {
-                    Bitmap emptyImage = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
+                    if(drawable.getIntrinsicWidth() > 0 && drawable.getIntrinsicHeight() > 0) {
+                    	Bitmap emptyImage = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
+                    } else {
+                    	Bitmap emptyImage = Bitmap.createBitmap(imageSizeDefault, imageSizeDefault, Bitmap.Config.ARGB_8888);
+                    }
                     existingDrawable = new BitmapDrawable(emptyImage);
                 }