summaryrefslogtreecommitdiff
path: root/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
diff options
context:
space:
mode:
Diffstat (limited to 'macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m')
-rwxr-xr-xmacosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m31
1 files changed, 17 insertions, 14 deletions
diff --git a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
index d84ad6bc..9097ffe8 100755
--- a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
+++ b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
@@ -12,6 +12,7 @@
#include <OpenGL/gl.h> // bah, "externals.h" thinks include files are for wimps; OpenGL header, in fact, is needed
#include "externals.h"
#import "ARCBridge.h"
+#import "PluginGLView.h"
#ifdef ENABLE_NLS
#include <libintl.h>
@@ -85,20 +86,22 @@ void AboutDlgProc()
void DlgProc()
{
- NSWindow *window;
-
- PrepFactoryDefaultPreferences(); // Must do here to avoid a "when does such-and-such bind" issue
-
- if (windowController == nil) {
- windowController = [[PluginConfigController alloc] initWithWindowNibName:@"NetSfPeopsOpenGLConfig"];
- }
- window = [windowController window];
-
- /* load values */
- [windowController loadValues];
-
- [window center];
- [window makeKeyAndOrderFront:nil];
+ RunOnMainThreadSync(^{
+ NSWindow *window;
+
+ PrepFactoryDefaultPreferences(); // Must do here to avoid a "when does such-and-such bind" issue
+
+ if (windowController == nil) {
+ windowController = [[PluginConfigController alloc] initWithWindowNibName:@"NetSfPeopsOpenGLConfig"];
+ }
+ window = [windowController window];
+
+ /* load values */
+ [windowController loadValues];
+
+ [window center];
+ [window makeKeyAndOrderFront:nil];
+ });
}
#define kFPSCounter @"FPS Counter"