summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/gallery3d/app/AlbumPage.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 7f947d8f3..c3ef4c326 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -652,9 +652,17 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
if (mMediaSet == null)
return false;
int count = mMediaSet.getMediaItemCount();
+ ArrayList<MediaItem> list;
MediaItem item;
for (int i = 0; i < count; i++) {
- item = mMediaSet.getMediaItem(i, 1).get(0);
+ list = mMediaSet.getMediaItem(i, 1);
+ if (list == null) {
+ continue;
+ }
+ if (list.isEmpty()) {
+ break;
+ }
+ item = list.get(0);
if (item == null) {
continue;
}