diff options
author | George Mount <mount@google.com> | 2012-10-10 16:59:45 -0700 |
---|---|---|
committer | George Mount <mount@google.com> | 2012-10-10 16:59:45 -0700 |
commit | 7148ec4b900fcf3cd9c1f148992313d584557f72 (patch) | |
tree | be12eee7078044766afe0044f53d69df459477c2 | |
parent | 3d78e6dbf22b91b536a5fd14b97244e3e05f9c15 (diff) | |
download | android_packages_apps_Snap-7148ec4b900fcf3cd9c1f148992313d584557f72.tar.gz android_packages_apps_Snap-7148ec4b900fcf3cd9c1f148992313d584557f72.tar.bz2 android_packages_apps_Snap-7148ec4b900fcf3cd9c1f148992313d584557f72.zip |
Fix NPE due to progress bar not existing.
Bug 7325685
Change-Id: I5e24b4f8a0ee4016c122e14702e3ae575f5bb56f
-rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index d6723ca51..2e19a2ba8 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -661,12 +661,14 @@ public class PhotoPage extends ActivityState implements && (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); + } } } } |