Changeset 20983

Timestamp:

01/03/08 11:53:24 (8 months ago)

Author:

patrick

Message:

Fixed a race condition that could cause application crashes at startup.
This is extracted from a patch posted to the vrjuggler-devel list by Daniel
Shipton.

Files:

• juggler/trunk/modules/vrjuggler/vrj/Draw/OpenGL/WindowCocoa.mm (modified) (2 diffs)

juggler/trunk/modules/vrjuggler/vrj/Draw/OpenGL/WindowCocoa.mm

@@ -211 +211 @@
-                                         inputHandling:handle_input];
-      mMainView = mGlView;
-
-      // mCocoaWindow retains a refernece to mGlView, meaning that the
-      // reference count on it is now two. We release our reference to mGlView
-      // later when we are done with it.
-      [mCocoaWindow setContentView:mGlView];
-      [mCocoaWindow setInitialFirstResponder:mGlView];
-
-      // If the window is full screen, then it has to be at the shielding
@@ -263 +257 @@
-         makeCurrent();
-         // TODO: Add extension loading stuff.
+
+         // mCocoaWindow retains a refernece to mGlView, meaning that the
+         // reference count on it is now two. We release our reference to
+         // mGlView later when we are done with it.
+         [mCocoaWindow setContentView:mGlView];
+         [mCocoaWindow setInitialFirstResponder:mGlView];
-      }
-   }