From 1a1f92877c1207538a22b04cf9ad6f4e345f03f0 Mon Sep 17 00:00:00 2001 From: rogerman Date: Thu, 23 Aug 2012 20:00:57 +0000 Subject: [PATCH] Cocoa Port: - Fix bug where File menu items were being permanently disabled when the file migration sheet was used. - Fix bug where closeRom: would occasionally not work correctly. --- desmume/src/cocoa/userinterface/emuWindowDelegate.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desmume/src/cocoa/userinterface/emuWindowDelegate.mm b/desmume/src/cocoa/userinterface/emuWindowDelegate.mm index dbf217693..273ff3485 100644 --- a/desmume/src/cocoa/userinterface/emuWindowDelegate.mm +++ b/desmume/src/cocoa/userinterface/emuWindowDelegate.mm @@ -335,7 +335,7 @@ [self handleLoadRom:selectedFile]; } -- (IBAction) closeRom:(id)sender; +- (IBAction) closeRom:(id)sender { [self handleUnloadRom:REASONFORCLOSE_NORMAL romToLoad:nil]; } @@ -1130,7 +1130,7 @@ [fileURL retain]; [self setIsSheetControllingExecution:YES]; - [self setIsShowingSaveStateSheet:YES]; + [self setIsShowingFileMigrationSheet:YES]; [NSApp beginSheet:saveFileMigrationSheet modalForWindow:window