Fix leaks / init

Change-Id: I5befdc24cc89cdcfb73ee4d13f076b1c4a585cf6

1 files changed, 8 insertions, 1 deletions

diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
index 7c45ee25c..87acd5ff1 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
@@ -34,7 +34,7 @@ public class MasterImage implements RenderingRequestCaller {
 
     private static final String LOGTAG = "MasterImage";
 
-    private static MasterImage sMasterImage = new MasterImage();
+    private static MasterImage sMasterImage = null;
 
     private ImageFilter mCurrentFilter = null;
     private ImagePreset mPreset = null;
@@ -58,6 +58,9 @@ public class MasterImage implements RenderingRequestCaller {
     private MasterImage() { }
 
     public static MasterImage getImage() {
+        if (sMasterImage == null) {
+            sMasterImage = new MasterImage();
+        }
         return sMasterImage;
     }
 
@@ -230,4 +233,8 @@ public class MasterImage implements RenderingRequestCaller {
             mFiltersOnlyBitmap = request.getBitmap();
         }
     }
+
+    public static void reset() {
+        sMasterImage = null;
+    }
 }