Merge "Don't take a snapshot if video recording is not in progress." into gb-ub-photos-carlsbad

1 files changed, 5 insertions, 3 deletions

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index ada0a606f..76e1c5a31 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -418,15 +418,17 @@ public class VideoModule implements CameraModule,
                     mOrientation).show();
             return;
         }
-
         takeASnapshot();
     }
 
     private void takeASnapshot() {
-        // only take snapshots if video snapshot is supported by device
+        // Only take snapshots if video snapshot is supported by device
         if (CameraUtil.isVideoSnapshotSupported(mParameters) && !mIsVideoCaptureIntent) {
+            if (!mMediaRecorderRecording || mPaused || mSnapshotInProgress || effectsActive()) {
+                return;
+            }
             MediaSaveService s = mActivity.getMediaSaveService();
-            if (mPaused || mSnapshotInProgress || effectsActive() || s == null || s.isQueueFull()) {
+            if (s == null || s.isQueueFull()) {
                 return;
             }