fixed #14

rileytestut · Jun 5, 2012 · 107c758 · 107c758
1 parent b4c9e9c
commit 107c758
Show file tree

Hide file tree

Showing 21 changed files with 13 additions and 1 deletion.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Classes/ControlPadConnectViewController.o b/Classes/ControlPadConnectViewController.o
diff --git a/Classes/ControlPadManager.o b/Classes/ControlPadManager.o
diff --git a/Classes/EmulationViewController.m b/Classes/EmulationViewController.m
@@ -378,7 +378,7 @@ - (void)object:(id)object clickedButtonAtIndex:(NSInteger)buttonIndex {
 	if (buttonIndex == quitIndex) {
         NSLog(@"Quit button clicked");
 		__emulation_run = 0;
-        [AppDelegate() showEmulator:NO];
+//        [self performSelector:@selector(exit:) withObject:self afterDelay:1.0];
 	} else if (buttonIndex == saveCurrentIndex) {
 		NSLog(@"save to current file button clicked");
 		__emulation_saving = 2;

diff --git a/Classes/EmulationViewController.o b/Classes/EmulationViewController.o
diff --git a/Classes/RomDetailViewController.o b/Classes/RomDetailViewController.o
diff --git a/Classes/RomSelectionViewController.o b/Classes/RomSelectionViewController.o
diff --git a/Classes/SNES4iOSAppDelegate.m b/Classes/SNES4iOSAppDelegate.m
@@ -37,6 +37,12 @@ @implementation SNES4iOSAppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {    
 
+    if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) {
+        NSDictionary *new = [NSDictionary dictionaryWithObject:@"Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_0 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7A341 Safari/528.16" forKey:@"UserAgent"];
+        [[NSUserDefaults standardUserDefaults] registerDefaults:new];
+    }
+
+
     [[UIApplication sharedApplication] setIdleTimerDisabled:YES];
 
 	settingsViewController = [[SettingsViewController alloc] init];

diff --git a/Classes/SNES4iOSAppDelegate.o b/Classes/SNES4iOSAppDelegate.o
diff --git a/Classes/SNESControllerAppDelegate.o b/Classes/SNESControllerAppDelegate.o
diff --git a/Classes/SNESControllerViewController.o b/Classes/SNESControllerViewController.o
diff --git a/Classes/SaveStateSelectionViewController.o b/Classes/SaveStateSelectionViewController.o
diff --git a/Classes/ScreenLayer.o b/Classes/ScreenLayer.o
diff --git a/Classes/ScreenView.o b/Classes/ScreenView.o
diff --git a/Classes/SessionController.o b/Classes/SessionController.o
diff --git a/Classes/SettingsViewController.o b/Classes/SettingsViewController.o
diff --git a/Classes/WebBrowserViewController.m b/Classes/WebBrowserViewController.m
@@ -51,6 +51,7 @@ - (void)WebDownloadInternal_downloadDidBegin:(NSURLDownload *)download
 }
 #endif
 
+
 -(void)UIWebView_webView:(id)sender decidePolicyForMIMEType:(NSString*)type request:(NSURLRequest*)request frame:(id)frame decisionListener:(WebPolicyDecisionListener*)listener
 {
   //NSMutableURLRequest *urlRequest = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:apiUrl]  cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:30];
@@ -227,6 +228,7 @@ - (void) viewDidLoad
 	[NSClassFromString(@"WebDefaultPolicyDelegate") changeMethod: @selector(webView:decidePolicyForMIMEType:request:frame:decisionListener:) withMethod: @selector(UIWebView_webView:decidePolicyForMIMEType:request:frame:decisionListener:) error:nil];
 
 	[webView setScalesPageToFit: YES];
+
 	webView.delegate = self;
 
 	UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"ArrowBack.png"]
@@ -283,6 +285,8 @@ - (void)loadBaseURL
 
   //URL Requst Object
   NSURLRequest *requestObj = [NSURLRequest requestWithURL:url];
+
+
 
   //Load the request in the UIWebView.
 	NSLog(@"loading URL: %@", url);

diff --git a/Classes/WebBrowserViewController.o b/Classes/WebBrowserViewController.o
diff --git a/src/snes4iphone_src/main.mm b/src/snes4iphone_src/main.mm
@@ -1313,6 +1313,8 @@ int main(int argc, char *argv[])
   			}
   			if(!__emulation_run)
   			{
+                printf("exit from emulation");
+
     			set_gamma(100);
     			gp_Reset();
     			app_MuteSound();

diff --git a/src/snes4iphone_src/pocketsnesd b/src/snes4iphone_src/pocketsnesd
diff --git a/src/snes4iphone_src/snes4iphone b/src/snes4iphone_src/snes4iphone