diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-01-09 01:50:38 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-01-09 01:50:38 +0000 |
| commit | 9af085242bda9ad4da78ef23e9d4ed180aa2c629 (patch) | |
| tree | c776a5dfefbe475936a461b54d469d244df9de75 /macosx/PcsxrDiscHandler.m | |
| parent | c5b4bf6974fbfd05b6e75c494d11569756034e36 (diff) | |
| download | pcsxr-9af085242bda9ad4da78ef23e9d4ed180aa2c629.tar.gz | |
Use ARC in 64-bit mode on the Mac.
Register when we drag a disc image (or double click) to Pcsxr in the recent menu.
Comment out ReleasePlugins() in SysClose: it was causing a pointer to be released twice when you changed a plug-in (specifically, the GPU).
Cleaning up the Recent items code. One notable case is only releasing objects we have ownership of (this is pointless in ARC, but necessary in 32-bit code).
Had to rewrite -[PluginList setActivePlugin:forType:] because the previous version wasn't ARC-friendly.
If we select a disc while the emulator is running, load the disc into the current session.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@82136 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/PcsxrDiscHandler.m')
| -rwxr-xr-x | macosx/PcsxrDiscHandler.m | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/macosx/PcsxrDiscHandler.m b/macosx/PcsxrDiscHandler.m index 79c65704..8d83c8f9 100755 --- a/macosx/PcsxrDiscHandler.m +++ b/macosx/PcsxrDiscHandler.m @@ -10,6 +10,8 @@ #import "EmuThread.h" #include "psxcommon.h" #include "plugins.h" +#import "RecentItemsMenu.h" +#import "PcsxrController.h" @implementation PcsxrDiscHandler @@ -24,7 +26,9 @@ - (BOOL)handleFile:(NSString *)theFile { - if ([EmuThread active] == TRUE) { + PcsxrController *appDelegate = [NSApp delegate]; + [[appDelegate recentItems] addRecentItem:[NSURL fileURLWithPath:theFile]]; + if ([EmuThread active] == YES) { SetCdOpenCaseTime(time(NULL) + 2); SetIsoFile([theFile fileSystemRepresentation]); //[EmuThread reset]; |