summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/camera/PhotoModule.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 2fbe768b0..3e5e9bfb9 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2083,7 +2083,8 @@ public class PhotoModule
@Override
public synchronized void onShutterButtonClick() {
- if (mPaused || mShutterPressing
+ if ((mCameraDevice == null)
+ || mPaused || mShutterPressing
|| mUI.collapseCameraControls()
|| (mCameraState == SWITCHING_CAMERA)
|| (mCameraState == PREVIEW_STOPPED)