summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
-rw-r--r--src/com/android/camera/CameraActivity.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 55b3dd7c5..dbba305bc 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -723,6 +723,7 @@ public class CameraActivity extends Activity
} else {
// If camera preview is the only view left in filmstrip,
// no need to show undo bar.
+ mPendingDeletion = true;
performDeletion();
}
}
@@ -1028,6 +1029,8 @@ public class CameraActivity extends Activity
@Override
public void onPause() {
+ // Delete photos that are pending deletion
+ performDeletion();
mOrientationListener.disable();
mCurrentModule.onPauseBeforeSuper();
super.onPause();