Make OS X use LidInterrupt.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85469 e17a0e51-4ae3-4d35-97c3-1a29b211df97

2 files changed, 8 insertions, 5 deletions

diff --git a/macosx/PcsxrController.m b/macosx/PcsxrController.m
index 387cd029..d85c6ddb 100755
--- a/macosx/PcsxrController.m
+++ b/macosx/PcsxrController.m
@@ -10,6 +10,7 @@
 #include "psxcommon.h"
 #include "plugins.h"
 #include "misc.h"
+#include "cdrom.h"
 #include "ExtendedKeys.h"
 #import "ARCBridge.h"
 
@@ -44,8 +45,9 @@ NSString *saveStatePath;
 
 		if ([openDlg runModal] == NSFileHandlingPanelOKButton) {
 			NSArray* files = [openDlg URLs];
-			SetCdOpenCaseTime(time(NULL) + 2);
 			SetIsoFile((const char *)[[[files objectAtIndex:0] path] fileSystemRepresentation]);
+			SetCdOpenCaseTime(time(NULL) + 2);
+			LidInterrupt();
 		}
 		RELEASEOBJ(openDlg);
 	} else {
@@ -160,8 +162,9 @@ NSString *saveStatePath;
 {
     if ([EmuThread active] == YES) {
 		if (UsingIso()) {
-			SetCdOpenCaseTime(time(NULL) + 2);
 			SetIsoFile([[url path] fileSystemRepresentation]);
+			SetCdOpenCaseTime(time(NULL) + 2);
+			LidInterrupt();
 		} else {
 			NSBeep();
 		}
@@ -485,8 +488,6 @@ NSString *saveStatePath;
 		str = [[url path] fileSystemRepresentation];
 		if (str != nil) {
 			strlcpy(Config.PatchesDir, str, MAXPATHLEN);
-			//workaround for the fact that the PCSXR core doesn't append a forward slash to the patches dir
-			strlcat(Config.PatchesDir, "/", MAXPATHLEN);
 		}
 	} else {
 		strcpy(Config.BiosDir, "Bios/");
diff --git a/macosx/PcsxrDiscHandler.m b/macosx/PcsxrDiscHandler.m
index 025f5fdb..1aea4e3e 100755
--- a/macosx/PcsxrDiscHandler.m
+++ b/macosx/PcsxrDiscHandler.m
@@ -10,6 +10,7 @@
 #import "EmuThread.h"
 #include "psxcommon.h"
 #include "plugins.h"
+#include "cdrom.h"
 #import "RecentItemsMenu.h"
 #import "PcsxrController.h"
 
@@ -29,8 +30,9 @@
 	PcsxrController *appDelegate = [NSApp delegate];
 	if ([EmuThread active] == YES) {
 		if (UsingIso()) {
-			SetCdOpenCaseTime(time(NULL) + 2);
 			SetIsoFile([theFile fileSystemRepresentation]);
+			SetCdOpenCaseTime(time(NULL) + 2);
+			LidInterrupt();
 			//[EmuThread reset];
 		} else {
 			return NO;