From b25ee75d67ee25946c493be59bf14c044a8f45fc Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Sat, 26 Dec 2015 03:03:47 -0600 Subject: [PATCH] Added ability to return to main menu from PauseViewController --- Cores/SNESDeltaCore | 2 +- Delta/Base.lproj/Main.storyboard | 8 +++++++- Delta/Game Selection/GamesViewController.swift | 5 +++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Cores/SNESDeltaCore b/Cores/SNESDeltaCore index c3272f2..bfab567 160000 --- a/Cores/SNESDeltaCore +++ b/Cores/SNESDeltaCore @@ -1 +1 @@ -Subproject commit c3272f27e2bc7664b4c5368042d10a6ef9ac9846 +Subproject commit bfab5676607a4e8e913b3535c30dd308b25ebaa7 diff --git a/Delta/Base.lproj/Main.storyboard b/Delta/Base.lproj/Main.storyboard index c5c0349..7c3fd31 100644 --- a/Delta/Base.lproj/Main.storyboard +++ b/Delta/Base.lproj/Main.storyboard @@ -248,7 +248,13 @@ - + + + + + + + diff --git a/Delta/Game Selection/GamesViewController.swift b/Delta/Game Selection/GamesViewController.swift index f98a3a8..7600a21 100644 --- a/Delta/Game Selection/GamesViewController.swift +++ b/Delta/Game Selection/GamesViewController.swift @@ -131,6 +131,11 @@ class GamesViewController: UIViewController { } + + @IBAction func unwindFromEmulationViewController(segue: UIStoryboardSegue) + { + + } } private extension GamesViewController