1 files changed, 21 insertions, 6 deletions
diff --git a/src/org/cyanogenmod/wallpapers/photophase/preferences/ChoosePicturesFragment.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/ChoosePicturesFragment.java
index 513ea33..df13028 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/preferences/ChoosePicturesFragment.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/ChoosePicturesFragment.java
@@ -73,7 +73,7 @@ import java.util.Set;
  * A fragment class for select the picture that will be displayed on the wallpaper
  */
 public class ChoosePicturesFragment extends PreferenceFragment
-        implements AlbumInfoView.CallbacksListener, OnClickListener {
+        implements AlbumInfoView.CallbacksListener, OnClickListener, OnBackPressedListener {
 
     private static final String TAG = "ChoosePicturesFragment";
 
@@ -210,11 +210,13 @@ public class ChoosePicturesFragment extends PreferenceFragment
          * @return boolean if an item is selected
          */
         private boolean isSelectedItem(String item) {
-            Iterator<String> it = mSelectedAlbums.iterator();
-            while (it.hasNext()) {
-                String albumPath = it.next();
-                if (item.compareTo(albumPath) == 0) {
-                    return true;
+            if (mSelectedAlbums != null) {
+                Iterator<String> it = mSelectedAlbums.iterator();
+                while (it.hasNext()) {
+                    String albumPath = it.next();
+                    if (item.compareTo(albumPath) == 0) {
+                        return true;
+                    }
                 }
             }
             return false;
@@ -565,6 +567,19 @@ public class ChoosePicturesFragment extends PreferenceFragment
     }
 
     /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean onBackPressed() {
+        if (!mShowingAlbums) {
+            // Hide album pictures
+            hideAlbumPictures(mDstParent, mDstView, mSrcParent, mSrcView);
+            return true;
+        }
+        return false;
+    }
+
+    /**
      * Method that update the album selection
      *
      * @param album The album to update