Merge pull request #854 from asmorkalov:android_null_invalid_cam

This commit is contained in:
Andrey Pavlenko 2013-04-30 17:36:39 +04:00 committed by OpenCV Buildbot
commit 48a8aefd6b

View File

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