summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/gallery3d')
-rw-r--r--src/com/android/gallery3d/data/MediaSet.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/data/MediaSet.java b/src/com/android/gallery3d/data/MediaSet.java
index d5d1048e0..f92faa74e 100644
--- a/src/com/android/gallery3d/data/MediaSet.java
+++ b/src/com/android/gallery3d/data/MediaSet.java
@@ -136,7 +136,9 @@ public abstract class MediaSet extends MediaObject {
protected int getIndexOf(Path path, ArrayList<MediaItem> list) {
for (int i = 0, n = list.size(); i < n; ++i) {
- if (list.get(i).mPath == path) return i;
+ // item could be null only in ClusterAlbum
+ MediaObject item = list.get(i);
+ if (item != null && item.mPath == path) return i;
}
return INDEX_NOT_FOUND;
}