1 files changed, 8 insertions, 3 deletions
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m
index 7bfa656f..47d9a512 100755
--- a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m
+++ b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m
@@ -18,8 +18,8 @@
 
 #import "PluginWindowController.h"
 #import "PluginWindow.h"
-#import "Carbon/Carbon.h"
 #include "externals.h"
+#import "ARCBridge.h"
 #undef BOOL
 
 NSWindow *gameWindow;
@@ -63,13 +63,18 @@ NSRect windowFrame;
 {
 	if (fullWindow) {
 		[fullWindow orderOut:self];
+#if !__has_feature(objc_arc)
+
 		[fullWindow autorelease];
 		fullWindow = nil;
+#endif
 	}
 	
 	windowFrame = [[self window] frame];
 	
+#if !__has_feature(objc_arc)
 	[super dealloc];
+#endif
 }
 
 // forget keyDownEvents
@@ -154,7 +159,7 @@ NSRect windowFrame;
 
 		if (fullWindow) {
 			[fullWindow orderOut:self];
-			[fullWindow autorelease];
+			AUTORELEASEOBJNORETURN(fullWindow);
 			fullWindow = nil;
 			
 			[[glView openGLContext] setView:glView];
@@ -217,7 +222,7 @@ NSRect windowFrame;
 		return NO;
 	}
 	[[NSNotificationCenter defaultCenter] postNotificationName:@"emuWindowDidClose" object:self];
-	[gameController autorelease];
+	AUTORELEASEOBJNORETURN(gameController);
 	gameController = nil;
 	gameWindow = nil;