From 9d599064a8d9ae5795d51bc4a8e2f754fe2b17fa Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Sat, 21 May 2016 14:40:48 -0500 Subject: [PATCH] Fixes bug where peeking a save state then cancelling would prevent save states from working --- .../Pause Menu/Save States/SaveStatesViewController.swift | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Delta/Pause Menu/Save States/SaveStatesViewController.swift b/Delta/Pause Menu/Save States/SaveStatesViewController.swift index 86ae238..87f134e 100644 --- a/Delta/Pause Menu/Save States/SaveStatesViewController.swift +++ b/Delta/Pause Menu/Save States/SaveStatesViewController.swift @@ -270,6 +270,14 @@ private extension SaveStatesViewController func loadSaveState(saveState: SaveState) { + let emulatorCore = self.delegate.saveStatesViewControllerActiveEmulatorCore(self) + + if emulatorCore.state == .Stopped + { + emulatorCore.startEmulation() + emulatorCore.pauseEmulation() + } + self.delegate?.saveStatesViewController(self, loadSaveState: saveState) }