Merge pull request #134 from hyperoslo/bug/iPad-crash

Remove sessionPreset
hyperoslo · Apr 13, 2016 · 5af59f1 · 5af59f1
2 parents 09a9194 + cf7f9fc
commit 5af59f1
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/Source/CameraView/CameraView.swift b/Source/CameraView/CameraView.swift
@@ -135,7 +135,6 @@ class CameraView: UIViewController, CLLocationManagerDelegate {
   // MARK: - Initialize camera
 
   func initializeCamera() {
-    captureSession.sessionPreset = AVCaptureSessionPreset1920x1080
     capturedDevices = NSMutableArray()
 
     showNoCamera(false)
@@ -206,18 +205,13 @@ class CameraView: UIViewController, CLLocationManagerDelegate {
     self.captureDevice = capturedDevices?.objectAtIndex(newDeviceIndex) as? AVCaptureDevice
     configureDevice()
 
-    guard let currentCaptureDevice = self.captureDevice else { return }
+    guard let _ = self.captureDevice else { return }
+
     UIView.animateWithDuration(0.3, animations: { [unowned self] in
       self.containerView.alpha = 1
       }, completion: { finished in
         self.captureSession.beginConfiguration()
         self.captureSession.removeInput(currentDeviceInput)
-
-        self.captureSession.sessionPreset =
-          currentCaptureDevice.supportsAVCaptureSessionPreset(AVCaptureSessionPreset1280x720)
-          ? AVCaptureSessionPreset1280x720
-          : AVCaptureSessionPreset640x480
-
         do { try
           self.captureSession.addInput(AVCaptureDeviceInput(device: self.captureDevice))
         } catch {