Merge pull request #854 from asmorkalov:android_null_invalid_cam

48a8aefd · Andrey Pavlenko · OpenCV Buildbot · f21e99de · 456c56fe · 48a8aefd
Commit 48a8aefd authored Apr 30, 2013 by Andrey Pavlenko Committed by OpenCV Buildbot Apr 30, 2013
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

android+NativeCameraView.java ...les/java/generator/src/java/android+NativeCameraView.java +2 -0

No files found.
--- a/modules/java/generator/src/java/android+NativeCameraView.java
+++ b/modules/java/generator/src/java/android+NativeCameraView.java
@@ -53,6 +53,7 @@ public class NativeCameraView extends CameraBridgeViewBase {
        /* 1. We need to stop thread which updating the frames
         * 2. Stop camera and release it
         */
+        if (mThread != null) {
            try {
                mStopThread = true;
                mThread.join();
@@ -62,6 +63,7 @@ public class NativeCameraView extends CameraBridgeViewBase {
                mThread =  null;
                mStopThread = false;
            }
+        }
        /* Now release camera */
        releaseCamera();