diff options
Diffstat (limited to 'src/nativewindow/classes/javax/media')
-rw-r--r-- | src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java index adc946f70..9bc8ca9e4 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java +++ b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java @@ -195,9 +195,10 @@ public abstract class NativeWindowFactory { final ClassLoader cl = NativeWindowFactory.class.getClassLoader(); - // X11 initialization before possible AWT initialization - initNativeImpl(firstUIActionOnProcess, cl); - + if(firstUIActionOnProcess) { + // X11 initialization before possible AWT initialization + initNativeImpl(true, cl); + } isAWTAvailable = false; // may be set to true below if( !Debug.getBooleanProperty("java.awt.headless", true, acc) && @@ -229,6 +230,10 @@ public abstract class NativeWindowFactory { } } } + if(!firstUIActionOnProcess) { + // X11 initialization after possible AWT initialization + initNativeImpl(false, cl); + } registeredFactories = Collections.synchronizedMap(new HashMap<Class<?>, NativeWindowFactory>()); // register our default factory -> NativeWindow |