3-group-ios/GBA002
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added ability to return to main menu from PauseViewController

Browse Source
This commit is contained in:
Riley Testut 2015-12-26 03:03:47 -06:00
parent fd2a81ead5
commit b25ee75d67
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cores/SNESDeltaCore

@ -1 +1 @@
Subproject commit c3272f27e2bc7664b4c5368042d10a6ef9ac9846 Subproject commit bfab5676607a4e8e913b3535c30dd308b25ebaa7

8
Delta/Base.lproj/Main.storyboard
View File

@ -248,7 +248,13 @@
</constraints> </constraints>
</view> </view>
<navigationItem key="navigationItem" title="Paused" id="hbg-6F-GRq"> <navigationItem key="navigationItem" title="Paused" id="hbg-6F-GRq">
<barButtonItem key="rightBarButtonItem" style="done" systemItem="done" id="ye0-Nk-K1X"> <barButtonItem key="leftBarButtonItem" title="Main Menu" style="done" id="zv1-Ig-77x">
<color key="tintColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<connections>
<segue destination="mTB-5a-Mdf" kind="unwind" unwindAction="unwindFromEmulationViewController:" id="8H0-x9-1QN"/>
</connections>
</barButtonItem>
<barButtonItem key="rightBarButtonItem" title="Resume" style="done" id="ye0-Nk-K1X">
<connections> <connections>
<segue destination="mTB-5a-Mdf" kind="unwind" unwindAction="unwindFromPauseViewController:" id="OIW-2I-L70"/> <segue destination="mTB-5a-Mdf" kind="unwind" unwindAction="unwindFromPauseViewController:" id="OIW-2I-L70"/>
</connections> </connections>

5
Delta/Game Selection/GamesViewController.swift
View File

@ -131,6 +131,11 @@ class GamesViewController: UIViewController
{ {
} }
@IBAction func unwindFromEmulationViewController(segue: UIStoryboardSegue)
{
}
} }
private extension GamesViewController private extension GamesViewController