Revision: 3809
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3809&view=rev
Author: kappa1
Date: 2012-11-03 18:06:08 +0000 (Sat, 03 Nov 2012)
Log Message:
-----------
Fix a native crash on startup of some applications
Modified Paths:
--------------
branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m
branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m
Modified: branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m
===================================================================
--- branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m 2012-11-01 22:39:22 UTC (rev 3808)
+++ branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m 2012-11-03 18:06:08 UTC (rev 3809)
@@ -497,7 +497,7 @@
}
MacOSXWindowInfo *window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
- if(floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5) {
+ //if(floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5) {
/*NSApplicationPresentationOptions options = NSApplicationPresentationDefault;
if (hide == JNI_TRUE) {
options = NSApplicationPresentationFullScreen; // this requires OS X 10.7+ to compile
@@ -509,11 +509,11 @@
if (window_info->window != nil) {
[[NSApplication sharedApplication] setPresentationOptions:options];
}*/
- } else {
+ //} else {
if (hide == JNI_TRUE) {
SetSystemUIMode(kUIModeContentSuppressed, 0);
} else {
SetSystemUIMode(kUIModeNormal, 0);
}
- }
+ //}
}
Modified: branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m
===================================================================
--- branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m 2012-11-01 22:39:22 UTC (rev 3808)
+++ branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m 2012-11-03 18:06:08 UTC (rev 3809)
@@ -58,7 +58,7 @@
MacOSXContext *shared_context_info;
MacOSXContext *context_info;
NSOpenGLContext *context;
- NSOpenGLContext *shared_context;
+ NSOpenGLContext *shared_context = NULL;
printf("nCreate\n");
jobject context_handle = newJavaManagedByteBuffer(env, sizeof(MacOSXContext));
if (context_handle == NULL) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
