commit 2cb4269ebc665c2f2786a8a81794d15b36e3a38c
author George Mount <mount@google.com> Wed Oct 10 17:03:10 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 10 17:03:10 2012 -0700
tree 8eaa2e1eaf0b5aab29f937677ef7662639f8abf1
parent df2aecb6944f1244fa6e3d35a135c8bea6d16ab0
parent 785a1f8a5856b199f6553a92020e77621516c608

Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches

src/com/android/gallery3d/app/PhotoPage.java

diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index d6723ca..2e19a2b 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -661,12 +661,14 @@
                 && (photo.getSupportedOperations() & MediaItem.SUPPORT_SHARE) != 0) {
             updateShareURI(photo.getPath());
         }
-        StitchingProgressManager progressManager = mApplication.getStitchingProgressManager();
-        mProgressBar.hideProgress();
-        if (progressManager != null && mCurrentPhoto instanceof LocalImage) {
-            Integer progress = progressManager.getProgress(photo.getContentUri());
-            if (progress != null) {
-                mProgressBar.setProgress(progress);
+        if (mProgressBar != null) {
+            mProgressBar.hideProgress();
+            StitchingProgressManager progressManager = mApplication.getStitchingProgressManager();
+            if (progressManager != null && mCurrentPhoto instanceof LocalImage) {
+                Integer progress = progressManager.getProgress(photo.getContentUri());
+                if (progress != null) {
+                    mProgressBar.setProgress(progress);
+                }
             }
         }
     }