1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/exif/IfdParser.java b/src/com/android/gallery3d/exif/IfdParser.java
index 6638dafcb..e91b29dcd 100644
--- a/src/com/android/gallery3d/exif/IfdParser.java
+++ b/src/com/android/gallery3d/exif/IfdParser.java
@@ -85,6 +85,8 @@ public class IfdParser {
         } else {
             if (offset <= mOffsetToNextIfd) {
                 skipTo(mOffsetToNextIfd);
+                // Reset mOffsetToNextIfd to 0 so next call to next() will point to the end
+                mOffsetToNextIfd = 0;
                 return TYPE_NEXT_IFD;
             } else {
                 return TYPE_END;