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

1 files changed, 9 insertions, 0 deletions

diff --git a/subsonic-android/src/github/daneren2005/dsub/util/ImageLoader.java b/subsonic-android/src/github/daneren2005/dsub/util/ImageLoader.java
index 35e24039..133f2c26 100644
--- a/subsonic-android/src/github/daneren2005/dsub/util/ImageLoader.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/ImageLoader.java
@@ -158,6 +158,15 @@ public class ImageLoader implements Runnable {
                     	emptyImage = Bitmap.createBitmap(imageSizeDefault, imageSizeDefault, Bitmap.Config.ARGB_8888);
                     }
                     existingDrawable = new BitmapDrawable(emptyImage);
+                } else {
+                	// Try to get rid of old transitions
+                	try {
+                		TransitionDrawable tmp = (TransitionDrawable) existingDrawable;
+                		int layers = tmp.getNumberOfLayers();
+                		existingDrawable = tmp.getDrawable(layers - 1;)
+                	} catch(Exception e) {
+                		// Do nothing, just means that the drawable is a flat image
+                	}
                 }
 
                 Drawable[] layers = new Drawable[]{existingDrawable, drawable};