2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7efb7288..218e7493 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Jun 19, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
+
+ * macosx/PcsxController.m: Do not simulate CD case open if user clicked
+   Cancel in switch ISO dialog.
+
 Jun 16, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
 
  * libpcsxcore/psxcommon.c: Do not allow hotkeys inside a softcall from HLE
diff --git a/macosx/PcsxController.m b/macosx/PcsxController.m
index 87cb15d5..094d44a0 100644
--- a/macosx/PcsxController.m
+++ b/macosx/PcsxController.m
@@ -35,10 +35,9 @@ NSString *saveStatePath;
 
 		if ([openDlg runModal] == NSOKButton) {
 			NSArray* files = [openDlg filenames];
+			SetCdOpenCaseTime(time(NULL) + 2);
 			SetIsoFile((const char *)[[files objectAtIndex:0] fileSystemRepresentation]);
 		}
-
-        SetCdOpenCaseTime(time(NULL) + 2);
 	} else {
 		if (CDR_getDriveLetter() != nil) {
 			deviceName = [NSMutableString stringWithCString:CDR_getDriveLetter()];