diff --git a/Delta/Emulation/GameViewController.swift b/Delta/Emulation/GameViewController.swift index 891cec7..1e65b1a 100644 --- a/Delta/Emulation/GameViewController.swift +++ b/Delta/Emulation/GameViewController.swift @@ -188,6 +188,13 @@ extension GameViewController self.updateControllers() } + override func viewDidDisappear(_ animated: Bool) + { + super.viewDidDisappear(animated) + + self.emulatorCore?.pause() + } + // MARK: - Segues /// KVO diff --git a/Delta/Pause Menu/Save States/SaveStatesViewController.swift b/Delta/Pause Menu/Save States/SaveStatesViewController.swift index 2599974..857f7a4 100644 --- a/Delta/Pause Menu/Save States/SaveStatesViewController.swift +++ b/Delta/Pause Menu/Save States/SaveStatesViewController.swift @@ -66,7 +66,6 @@ class SaveStatesViewController: UICollectionViewController private let dateFormatter: DateFormatter private let previewGameViewController = GameViewController() - private var previewInteraction: UIPreviewInteraction! required init?(coder aDecoder: NSCoder) { @@ -127,9 +126,6 @@ extension SaveStatesViewController // Pre-initialize previewGameViewController with game and start/pause emulation to ensure previewingContext(_:viewControllerForLocation:) callback doesn't take too long + break 3D Touch animation self.preparePreviewGameViewController() - self.previewInteraction = UIPreviewInteraction(view: self.collectionView!) - self.previewInteraction.delegate = self - self.registerForPreviewing(with: self, sourceView: self.collectionView!) self.updateBackgroundView() @@ -558,7 +554,7 @@ private extension SaveStatesViewController } //MARK: - 3D Touch - -extension SaveStatesViewController: UIViewControllerPreviewingDelegate, UIPreviewInteractionDelegate +extension SaveStatesViewController: UIViewControllerPreviewingDelegate { private func preparePreviewGameViewController() { @@ -635,15 +631,6 @@ extension SaveStatesViewController: UIViewControllerPreviewingDelegate, UIPrevie self.loadSaveState(saveState) } } - - func previewInteraction(_ previewInteraction: UIPreviewInteraction, didUpdatePreviewTransition transitionProgress: CGFloat, ended: Bool) - { - } - - func previewInteractionDidCancel(_ previewInteraction: UIPreviewInteraction) - { - self.previewGameViewController.emulatorCore?.pause() - } } //MARK: - -