From b44c418ad8f84029dd640616924657b94c5e26a2 Mon Sep 17 00:00:00 2001
From: forteri76 <forteri76@gmail.com>
Date: Fri, 20 Jun 2014 12:48:30 +0000
Subject: [PATCH] Fixed bug with the scaled bitmaps image list when the bitmaps
 weren't scaled.  This is code that I broke by removing the check for the
 image list containing direct references to the original bitmaps.

---
 AndroidManifest.xml                       | 4 ++--
 src/org/jfedor/frozenbubble/GameView.java | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 67b9952..20ef7fe 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.jfedor.frozenbubble"
-  android:versionCode="35"
-  android:versionName="3.2">
+  android:versionCode="36"
+  android:versionName="3.3">
 
   <supports-screens
     android:smallScreens="true"
diff --git a/src/org/jfedor/frozenbubble/GameView.java b/src/org/jfedor/frozenbubble/GameView.java
index 6f09e7e..8580dad 100644
--- a/src/org/jfedor/frozenbubble/GameView.java
+++ b/src/org/jfedor/frozenbubble/GameView.java
@@ -1076,7 +1076,13 @@ public void cleanUp() {
         int size = mImageList.size();
         while (size > 0) {
           BmpWrap bmpWrap = mImageList.elementAt(--size);
-          bmpWrap.bmp.recycle();
+          /*
+           * If the bitmaps were not scaled, then they will already have
+           * been recycled.
+           */
+          if (bmpWrap.bmp != null) {
+            bmpWrap.bmp.recycle();
+          }
           bmpWrap.bmp = null;
         }
         mImageList.clear();