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
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 8 deletions

android+NativeCameraView.java ...les/java/generator/src/java/android+NativeCameraView.java +10 -8

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