summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Kistner <ralf@journeyapps.com>2016-02-06 15:00:53 +0300
committerRalf Kistner <ralf@journeyapps.com>2016-02-06 15:00:53 +0300
commit31bba74b34b59f089ea678082d8d6dfe3f403a2c (patch)
tree126b53ade104b8b9e3a466863b7abd5d54f80e61
parentf0e0335ca444a0563c5af8c567595f50d64248d3 (diff)
downloadzxing-android-embedded-31bba74b34b59f089ea678082d8d6dfe3f403a2c.tar.xz
Check for cameraInstance == null.
-rw-r--r--zxing-android-embedded/src/com/journeyapps/barcodescanner/CameraPreview.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/zxing-android-embedded/src/com/journeyapps/barcodescanner/CameraPreview.java b/zxing-android-embedded/src/com/journeyapps/barcodescanner/CameraPreview.java
index 377ca568..b303ff82 100644
--- a/zxing-android-embedded/src/com/journeyapps/barcodescanner/CameraPreview.java
+++ b/zxing-android-embedded/src/com/journeyapps/barcodescanner/CameraPreview.java
@@ -657,7 +657,7 @@ public class CameraPreview extends ViewGroup {
private void startCameraPreview(CameraSurface surface) {
- if (!previewActive) {
+ if (!previewActive && cameraInstance != null) {
Log.i(TAG, "Starting preview");
cameraInstance.setSurface(surface);
cameraInstance.startPreview();