From 1e5b7127472e41ff2f11ce2d42a5e7753f088276 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Wed, 20 Jun 2007 08:57:45 +0000 Subject: [PATCH] Mac OS X: Add a Toolkit.getDefaultToolkit() incantation to MacOSXSysImplementation to avoid hangs on Mac OS X 10.3 --- build.xml | 3 ++- src/java/org/lwjgl/MacOSXSysImplementation.java | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index a12a5b27..b7e3430c 100644 --- a/build.xml +++ b/build.xml @@ -307,7 +307,8 @@ - + + diff --git a/src/java/org/lwjgl/MacOSXSysImplementation.java b/src/java/org/lwjgl/MacOSXSysImplementation.java index 650a3b41..457cd2d8 100644 --- a/src/java/org/lwjgl/MacOSXSysImplementation.java +++ b/src/java/org/lwjgl/MacOSXSysImplementation.java @@ -34,6 +34,7 @@ package org.lwjgl; import java.lang.reflect.Method; import java.security.AccessController; import java.security.PrivilegedExceptionAction; +import java.awt.Toolkit; /** * @@ -42,6 +43,11 @@ import java.security.PrivilegedExceptionAction; * $Id$ */ class MacOSXSysImplementation extends J2SESysImplementation { + static { + // Make sure AWT is properly initialized. This avoids hangs on Mac OS X 10.3 + Toolkit.getDefaultToolkit(); + } + public boolean openURL(String url) { try { Method openURL_method = (Method)AccessController.doPrivileged(new PrivilegedExceptionAction() {