X11Util.shutdown(): Remove x11IOErrorHandler

2 files changed, 7 insertions, 0 deletions

diff --git a/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java b/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java
index 07d3ef36f..d1d8bcebe 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java
@@ -277,6 +277,7 @@ public class X11Util {
             openDisplayList.clear();
             pendingDisplayList.clear();
             openDisplayMap.clear();
+            shutdown0();
         }
         return num;
     }
@@ -690,5 +691,6 @@ public class X11Util {
     }
 
     private static native boolean initialize0(boolean firstUIActionOnProcess);
+    private static native void shutdown0();
     private static native void setX11ErrorHandler0(boolean onoff, boolean quiet);
 }
diff --git a/src/nativewindow/native/x11/Xmisc.c b/src/nativewindow/native/x11/Xmisc.c
index 8b56bca90..d28891cda 100644
--- a/src/nativewindow/native/x11/Xmisc.c
+++ b/src/nativewindow/native/x11/Xmisc.c
@@ -317,6 +317,11 @@ Java_jogamp_nativewindow_x11_X11Util_initialize0(JNIEnv *env, jclass _unused, jb
 }
 
 JNIEXPORT void JNICALL 
+Java_jogamp_nativewindow_x11_X11Util_shutdown0(JNIEnv *env, jclass _unused) {
+    x11IOErrorHandlerEnable(0, env);
+}
+
+JNIEXPORT void JNICALL 
 Java_jogamp_nativewindow_x11_X11Util_setX11ErrorHandler0(JNIEnv *env, jclass _unused, jboolean onoff, jboolean quiet) {
   x11ErrorHandlerEnableBlocking(env, ( JNI_TRUE == onoff ) ? 1 : 0, ( JNI_TRUE == quiet ) ? 1 : 0);
 }