Merge pull request #7044 from wolever:master

modules/videoio/src/cap_ios_abstract_camera.mm

@@ -193,6 +193,7 @@
 
     // Release any retained subviews of the main view.
     // e.g. self.myOutlet = nil;
+    if (self.captureSession) {
         for (AVCaptureInput *input in self.captureSession.inputs) {
             [self.captureSession removeInput:input];
         }
@@ -203,6 +204,8 @@
 
         [self.captureSession stopRunning];
         self.captureSession = nil;
+    }
+
     self.captureVideoPreviewLayer = nil;
     self.videoCaptureConnection = nil;
     captureSessionLoaded = NO;

modules/videoio/src/cap_ios_video_camera.mm

@@ -122,10 +122,6 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;}
 
 - (void)stop;
 {
-    if (self.running == NO) {
-        return;
-    }
-
     [super stop];
 
     self.videoDataOutput = nil;
@@ -134,22 +130,25 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;}
     }
 
     if (self.recordVideo == YES) {
-
+        if (self.recordAssetWriter) {
             if (self.recordAssetWriter.status == AVAssetWriterStatusWriting) {
                 [self.recordAssetWriter finishWriting];
                 NSLog(@"[Camera] recording stopped");
             } else {
                 NSLog(@"[Camera] Recording Error: asset writer status is not writing");
             }
-
             self.recordAssetWriter = nil;
+        }
+
         self.recordAssetWriterInput = nil;
         self.recordPixelBufferAdaptor = nil;
     }
 
+    if (self.customPreviewLayer) {
         [self.customPreviewLayer removeFromSuperlayer];
         self.customPreviewLayer = nil;
     }
+}
 
 // TODO fix
 - (void)adjustLayoutToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation;