Merge pull request #854 from asmorkalov:android_null_invalid_cam

2013-04-30 17:36:39 +04:00 · 2013-04-30 17:36:39 +04:00 · 48a8aefd6b
commit 48a8aefd6b
parent f21e99de0f 456c56fe90
1 changed files with 10 additions and 8 deletions
--- 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 {
-            mStopThread = true;
-            mThread.join();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        } finally {
-            mThread =  null;
-            mStopThread = false;
+        if (mThread != null) {
+            try {
+                mStopThread = true;
+                mThread.join();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            } finally {
+                mThread =  null;
+                mStopThread = false;
+            }
        }

        /* Now release camera */