clear timer once video is complete

otherwise the old timer remains when returning to the capture view
pull/2/head
Michael Kirk 6 years ago
parent 1e4f670ffd
commit d8dbbd328d

@ -6,7 +6,6 @@ import Foundation
import AVFoundation import AVFoundation
import PromiseKit import PromiseKit
@objc(OWSPhotoCaptureViewControllerDelegate)
protocol PhotoCaptureViewControllerDelegate: AnyObject { protocol PhotoCaptureViewControllerDelegate: AnyObject {
func photoCaptureViewController(_ photoCaptureViewController: PhotoCaptureViewController, didFinishProcessingAttachment attachment: SignalAttachment) func photoCaptureViewController(_ photoCaptureViewController: PhotoCaptureViewController, didFinishProcessingAttachment attachment: SignalAttachment)
func photoCaptureViewControllerDidCancel(_ photoCaptureViewController: PhotoCaptureViewController) func photoCaptureViewControllerDidCancel(_ photoCaptureViewController: PhotoCaptureViewController)
@ -31,10 +30,8 @@ extension PhotoCaptureError: LocalizedError {
} }
} }
@objc(OWSPhotoCaptureViewController)
class PhotoCaptureViewController: OWSViewController { class PhotoCaptureViewController: OWSViewController {
@objc
weak var delegate: PhotoCaptureViewControllerDelegate? weak var delegate: PhotoCaptureViewControllerDelegate?
private var photoCapture: PhotoCapture! private var photoCapture: PhotoCapture!
@ -373,8 +370,9 @@ extension PhotoCaptureViewController: PhotoCaptureDelegate {
} }
func photoCaptureDidCompleteVideo(_ photoCapture: PhotoCapture) { func photoCaptureDidCompleteVideo(_ photoCapture: PhotoCapture) {
// Stop counting, but keep visible isRecordingMovie = false
recordingTimerView.stopCounting() recordingTimerView.stopCounting()
updateNavigationItems()
} }
func photoCaptureDidCancelVideo(_ photoCapture: PhotoCapture) { func photoCaptureDidCancelVideo(_ photoCapture: PhotoCapture) {

Loading…
Cancel
Save