2 files changed, 16 insertions, 10 deletions

diff --git a/src/newt/classes/jogamp/newt/driver/egl/gbm/DisplayDriver.java b/src/newt/classes/jogamp/newt/driver/egl/gbm/DisplayDriver.java
index e83e8e2a7..4d9835826 100644
--- a/src/newt/classes/jogamp/newt/driver/egl/gbm/DisplayDriver.java
+++ b/src/newt/classes/jogamp/newt/driver/egl/gbm/DisplayDriver.java
@@ -29,7 +29,6 @@ package jogamp.newt.driver.egl.gbm;
 
 import com.jogamp.nativewindow.AbstractGraphicsDevice;
 import com.jogamp.nativewindow.NativeWindowException;
-import com.jogamp.nativewindow.egl.EGLGraphicsDevice;
 import com.jogamp.opengl.GLProfile;
 
 import jogamp.newt.DisplayImpl;
@@ -51,7 +50,7 @@ public class DisplayDriver extends DisplayImpl {
         if (!WindowDriver.initIDs()) {
             throw new NativeWindowException("Failed to initialize egl.gbm Window jmethodIDs");
         }
-        drmHandle = initDrm();
+        drmHandle = initDrm(DEBUG);
     }
 
     static void validateDrm() {
@@ -62,7 +61,6 @@ public class DisplayDriver extends DisplayImpl {
 
     public static void initSingleton() {
         // just exist to ensure static init has been run
-        validateDrm();
     }
 
     private static void shutdownHook() {
@@ -100,7 +98,7 @@ public class DisplayDriver extends DisplayImpl {
     // Internals only
     //
     private static native boolean initIDs();
-    private static native long initDrm();
+    private static native long initDrm(boolean verbose);
     private static native void freeDrm(long drmHandle);
 
     private static native long OpenGBMDisplay0(long drmHandle);
diff --git a/src/newt/classes/jogamp/newt/driver/egl/gbm/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/egl/gbm/WindowDriver.java
index 41f1bc359..79c0b0dac 100644
--- a/src/newt/classes/jogamp/newt/driver/egl/gbm/WindowDriver.java
+++ b/src/newt/classes/jogamp/newt/driver/egl/gbm/WindowDriver.java
@@ -49,8 +49,8 @@ public class WindowDriver extends WindowImpl {
     }
 
     public WindowDriver() {
-        linuxMouseTracker = LinuxMouseTracker.getSingleton();
-        linuxEventDeviceTracker = LinuxEventDeviceTracker.getSingleton();
+        linuxMouseTracker = null; // LinuxMouseTracker.getSingleton();
+        linuxEventDeviceTracker = null; // LinuxEventDeviceTracker.getSingleton();
 
         windowHandleClose = 0;
     }
@@ -162,8 +162,12 @@ public class WindowDriver extends WindowImpl {
         }
         windowHandleClose = nativeWindowHandle;
 
-        addWindowListener(linuxEventDeviceTracker);
-        addWindowListener(linuxMouseTracker);
+        if( null != linuxEventDeviceTracker ) {
+            addWindowListener(linuxEventDeviceTracker);
+        }
+        if( null != linuxMouseTracker ) {
+            addWindowListener(linuxMouseTracker);
+        }
         focusChanged(false, true);
     }
 
@@ -172,8 +176,12 @@ public class WindowDriver extends WindowImpl {
         final DisplayDriver display = (DisplayDriver) getScreen().getDisplay();
         final EGLGraphicsDevice eglDevice = (EGLGraphicsDevice) getGraphicsConfiguration().getScreen().getDevice();
 
-        removeWindowListener(linuxMouseTracker);
-        removeWindowListener(linuxEventDeviceTracker);
+        if( null != linuxMouseTracker ) {
+            removeWindowListener(linuxMouseTracker);
+        }
+        if( null != linuxEventDeviceTracker ) {
+            removeWindowListener(linuxEventDeviceTracker);
+        }
 
         if( 0 != windowHandleClose ) {
             CloseWindow0(display.getGBMHandle(), windowHandleClose);