Merge pull request #7029 from wolever:master

d67e6f5c · Vadim Pisarevsky · 1ae9a5d1 · 3d19de2b · d67e6f5c
Commit d67e6f5c authored Aug 04, 2016 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

cap_ios_video_camera.mm modules/videoio/src/cap_ios_video_camera.mm +8 -0

No files found.
--- a/modules/videoio/src/cap_ios_video_camera.mm
+++ b/modules/videoio/src/cap_ios_video_camera.mm
@@ -100,6 +100,10 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;}

 - (void)start;
 {
+    if (self.running == YES) {
+        return;
+    }
+
    recordingCountDown = 10;
    [super start];

@@ -118,6 +122,10 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;}

 - (void)stop;
 {
+    if (self.running == NO) {
+        return;
+    }
+
    [super stop];

    self.videoDataOutput = nil;