Window calls should only be done on the main thread on OS X.

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

1 files changed, 15 insertions, 12 deletions

diff --git a/macosx/plugins/DFXVideo/macsrc/drawgl.m b/macosx/plugins/DFXVideo/macsrc/drawgl.m
index eb3850d4..5eae22dd 100755
--- a/macosx/plugins/DFXVideo/macsrc/drawgl.m
+++ b/macosx/plugins/DFXVideo/macsrc/drawgl.m
@@ -99,27 +99,30 @@ void DoClearFrontBuffer(void)                          // CLEAR DX BUFFER
 
 unsigned long ulInitDisplay(void)	// OPEN GAME WINDOW
 {
-	bUsingTWin=FALSE;                          
+	bUsingTWin = FALSE;
 
-	InitMenu();                
+	InitMenu();
 
 	bIsFirstFrame = FALSE;
 
 	if(iShowFPS)
 	{
-		//iShowFPS=0;
-		ulKeybits|=KEY_SHOWFPS;
-		szDispBuf[0]=0;
+		//iShowFPS = 0;
+		ulKeybits |= KEY_SHOWFPS;
+		szDispBuf[0] = 0;
 		BuildDispMenu(0);
 	}
+	__block NSWindow *window = nil;
+	dispatch_sync(dispatch_get_main_queue(), ^{
+		PluginWindowController *windowController = [PluginWindowController openGameView];
+		glView = [windowController openGLView];
+		
+		NSString *title = [NSString stringWithCString:pCaptionText encoding:NSUTF8StringEncoding];
+		[[windowController window] setTitle:title];
+		window = [windowController window];
+	});
 	
-	PluginWindowController *windowController = [PluginWindowController openGameView];
-	glView = [windowController openGLView];
-	
-    NSString *title = [NSString stringWithCString:pCaptionText encoding:NSUTF8StringEncoding];
-	[[windowController window] setTitle:title];
-	
-	return (unsigned long)[windowController window];
+	return (unsigned long)window;
 }