3 files changed, 36 insertions, 3 deletions
diff --git a/macosx/PcsxrDiscHandler.h b/macosx/PcsxrDiscHandler.h
index 933d7799..150a580c 100755
--- a/macosx/PcsxrDiscHandler.h
+++ b/macosx/PcsxrDiscHandler.h
@@ -10,5 +10,8 @@
 #import "PcsxrFileHandle.h"
 
 @interface PcsxrDiscHandler : NSObject <PcsxrFileHandle>
+{
+	NSURL *discURL;
+}
 
 @end
diff --git a/macosx/PcsxrDiscHandler.m b/macosx/PcsxrDiscHandler.m
index 1aea4e3e..1bf2bfe5 100755
--- a/macosx/PcsxrDiscHandler.m
+++ b/macosx/PcsxrDiscHandler.m
@@ -14,8 +14,22 @@
 #import "RecentItemsMenu.h"
 #import "PcsxrController.h"
 
+@interface PcsxrDiscHandler ()
+@property (retain) NSURL *discURL;
+@end
+
 @implementation PcsxrDiscHandler
 
+@synthesize discURL;
+
+- (NSURL*)discURLFromFilePath:(NSString *)filePath
+{
+	if (!discURL) {
+		self.discURL = [NSURL fileURLWithPath:filePath isDirectory:NO];
+	}
+	return self.discURL;
+}
+
 + (NSArray *)supportedUTIs
 {
 	static NSArray *utisupport = nil;
@@ -38,11 +52,19 @@
 			return NO;
 		}
 	} else {
-		SetIsoFile([theFile fileSystemRepresentation]);
-		[EmuThread run];
+		[appDelegate runURL:[self discURLFromFilePath:theFile]];
 	}
-	[[appDelegate recentItems] addRecentItem:[NSURL fileURLWithPath:theFile]];
+	[[appDelegate recentItems] addRecentItem:[self discURLFromFilePath:theFile]];
 	return YES;
 }
 
+#if !__has_feature(objc_arc)
+- (void)dealloc
+{
+	self.discURL = nil;
+	
+	[super dealloc];
+}
+#endif
+
 @end
diff --git a/macosx/PcsxrFreezeStateHandler.m b/macosx/PcsxrFreezeStateHandler.m
index 4fbb49f0..f4711d1f 100755
--- a/macosx/PcsxrFreezeStateHandler.m
+++ b/macosx/PcsxrFreezeStateHandler.m
@@ -9,6 +9,7 @@
 #import "PcsxrFreezeStateHandler.h"
 #import "EmuThread.h"
 #import "ARCBridge.h"
+#import "PluginList.h"
 #include "misc.h"
 
 @implementation PcsxrFreezeStateHandler
@@ -28,6 +29,13 @@
 		return NO;
 	}
 	if (![EmuThread active]) {
+		PluginList *pluginList = [PluginList list];
+		if ([[NSUserDefaults standardUserDefaults] boolForKey:@"NetPlay"]) {
+			[pluginList enableNetPlug];
+		} else {
+			[pluginList disableNetPlug];
+		}
+
 		[EmuThread run];
 	}
 	return [EmuThread defrostAt:theFile];