diff options
| author | George Mount <mount@google.com> | 2012-10-10 17:04:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-10 17:04:17 -0700 |
| commit | 50150ace712bb4a70301fc4b6c24a1728024098c (patch) | |
| tree | 40de6f742a631db2a82ef81fb5965feb434a4701 /src/com/android/gallery3d | |
| parent | ea4065d75f362219c2b52c9ed54838ac0020d970 (diff) | |
| parent | 38701573fefe46f7a5af8cdf2c6c7002ef2bcaa5 (diff) | |
| download | android_packages_apps_Snap-50150ace712bb4a70301fc4b6c24a1728024098c.tar.gz android_packages_apps_Snap-50150ace712bb4a70301fc4b6c24a1728024098c.tar.bz2 android_packages_apps_Snap-50150ace712bb4a70301fc4b6c24a1728024098c.zip | |
am 2cb4269e: Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches
* commit '2cb4269ebc665c2f2786a8a81794d15b36e3a38c':
Fix NPE due to progress bar not existing.
Diffstat (limited to 'src/com/android/gallery3d')
| -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); + } } } } |