From 2e5616dd30878e3bc3393d30b2be45ee90891199 Mon Sep 17 00:00:00 2001
From: Riley Testut <riley@rileytestut.com>
Date: Fri, 10 Jun 2016 11:57:15 -0500
Subject: [PATCH] Updates save state usage to catch errors

---
 Cores/DeltaCore                               |  2 +-
 Cores/GBADeltaCore                            |  2 +-
 Cores/SNESDeltaCore                           |  2 +-
 .../xcshareddata/xcschemes/Delta.xcscheme     |  2 +-
 Delta/Emulation/EmulationViewController.swift | 13 ++++++++-
 .../Game Selection/GamesViewController.swift  | 17 ++++++++++-
 .../SaveStatesViewController.swift            | 28 +++++++++++++++++--
 7 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/Cores/DeltaCore b/Cores/DeltaCore
index 64f6520..593e5e7 160000
--- a/Cores/DeltaCore
+++ b/Cores/DeltaCore
@@ -1 +1 @@
-Subproject commit 64f652019405b72c2a4e3281da8d1e0514538ac3
+Subproject commit 593e5e758bf289e7d3d40f4dc37451c2f8ef791f
diff --git a/Cores/GBADeltaCore b/Cores/GBADeltaCore
index 06b2082..4f1684a 160000
--- a/Cores/GBADeltaCore
+++ b/Cores/GBADeltaCore
@@ -1 +1 @@
-Subproject commit 06b20822c7e9d28b9b3bcc6085deec2249a14e64
+Subproject commit 4f1684a28b50e76b6f416a5bc9e0b5f95266ffa7
diff --git a/Cores/SNESDeltaCore b/Cores/SNESDeltaCore
index 2c913a2..29db471 160000
--- a/Cores/SNESDeltaCore
+++ b/Cores/SNESDeltaCore
@@ -1 +1 @@
-Subproject commit 2c913a2b2910711fa1c12be31b00f2205170c935
+Subproject commit 29db4715fcca05791a5de4123c586a5c1590d0e0
diff --git a/Delta.xcodeproj/xcshareddata/xcschemes/Delta.xcscheme b/Delta.xcodeproj/xcshareddata/xcschemes/Delta.xcscheme
index a143786..acc3e14 100644
--- a/Delta.xcodeproj/xcshareddata/xcschemes/Delta.xcscheme
+++ b/Delta.xcodeproj/xcshareddata/xcschemes/Delta.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
diff --git a/Delta/Emulation/EmulationViewController.swift b/Delta/Emulation/EmulationViewController.swift
index a64d082..970904d 100644
--- a/Delta/Emulation/EmulationViewController.swift
+++ b/Delta/Emulation/EmulationViewController.swift
@@ -532,7 +532,18 @@ extension EmulationViewController: SaveStatesViewControllerDelegate
     
     func saveStatesViewController(saveStatesViewController: SaveStatesViewController, loadSaveState saveState: SaveStateType)
     {
-        self.emulatorCore.loadSaveState(saveState)
+        do
+        {
+            try self.emulatorCore.loadSaveState(saveState)
+        }
+        catch EmulatorCore.SaveStateError.doesNotExist
+        {
+            print("Save State \(saveState.name) does not exist.")
+        }
+        catch let error as NSError
+        {
+            print(error)
+        }
         
         self.updateCheats()
         
diff --git a/Delta/Game Selection/GamesViewController.swift b/Delta/Game Selection/GamesViewController.swift
index 74eb345..2861719 100644
--- a/Delta/Game Selection/GamesViewController.swift	
+++ b/Delta/Game Selection/GamesViewController.swift	
@@ -9,6 +9,8 @@
 import UIKit
 import CoreData
 
+import DeltaCore
+
 import Roxas
 
 class GamesViewController: UIViewController
@@ -132,7 +134,20 @@ class GamesViewController: UIViewController
                 {
                     destinationViewController.emulatorCore.startEmulation()
                     destinationViewController.emulatorCore.pauseEmulation()
-                    destinationViewController.emulatorCore.loadSaveState(saveState)
+                    
+                    do
+                    {
+                        try destinationViewController.emulatorCore.loadSaveState(saveState)
+                    }
+                    catch EmulatorCore.SaveStateError.doesNotExist
+                    {
+                        print("Save State \(saveState.name) does not exist.")
+                    }
+                    catch let error as NSError
+                    {
+                        print(error)
+                    }
+                    
                 }
             }
         }
diff --git a/Delta/Pause Menu/Save States/SaveStatesViewController.swift b/Delta/Pause Menu/Save States/SaveStatesViewController.swift
index 86edbca..88becae 100644
--- a/Delta/Pause Menu/Save States/SaveStatesViewController.swift	
+++ b/Delta/Pause Menu/Save States/SaveStatesViewController.swift	
@@ -427,7 +427,19 @@ private extension SaveStatesViewController
         // Load the save state we stored a reference to
         emulatorCore.startEmulation()
         emulatorCore.pauseEmulation()
-        emulatorCore.loadSaveState(saveState)
+        
+        do
+        {
+            try emulatorCore.loadSaveState(saveState)
+        }
+        catch EmulatorCore.SaveStateError.doesNotExist
+        {
+            print("Save State \(saveState.name) does not exist.")
+        }
+        catch let error as NSError
+        {
+            print(error)
+        }
         
         // Re-enable video rendering
         emulatorCore.videoManager.enabled = true
@@ -542,7 +554,19 @@ extension SaveStatesViewController: UIViewControllerPreviewingDelegate
             
             emulationViewController.emulatorCore.startEmulation()
             emulationViewController.emulatorCore.pauseEmulation()
-            emulationViewController.emulatorCore.loadSaveState(saveState)
+            
+            do
+            {
+                try emulationViewController.emulatorCore.loadSaveState(saveState)
+            }
+            catch EmulatorCore.SaveStateError.doesNotExist
+            {
+                print("Save State \(saveState.name) does not exist.")
+            }
+            catch let error as NSError
+            {
+                print(error)
+            }
         }
         
         return emulationViewController