summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/camera/panorama/PanoramaActivity.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java
index 2bb9f6c..8126a1b 100644
--- a/src/com/android/camera/panorama/PanoramaActivity.java
+++ b/src/com/android/camera/panorama/PanoramaActivity.java
@@ -255,7 +255,11 @@ public class PanoramaActivity extends Activity implements
break;
case MSG_GENERATE_FINAL_MOSAIC_ERROR:
onBackgroundThreadFinished();
- mAlertDialog.show();
+ if (mPausing) {
+ resetToPreview();
+ } else {
+ mAlertDialog.show();
+ }
break;
case MSG_RESET_TO_PREVIEW:
onBackgroundThreadFinished();