1 files changed, 4 insertions, 0 deletions
diff --git a/src/demos/com/jogamp/opengl/demos/util/MiscUtils.java b/src/demos/com/jogamp/opengl/demos/util/MiscUtils.java
index b2f1a56b6..b6e8c26d5 100644
--- a/src/demos/com/jogamp/opengl/demos/util/MiscUtils.java
+++ b/src/demos/com/jogamp/opengl/demos/util/MiscUtils.java
@@ -260,6 +260,10 @@ public class MiscUtils {
             System.err.println("Destroying window from thread "+Thread.currentThread());
             // Thread.dumpStack();
             glad.destroy();
+            final GLAnimatorControl animator = glad.getAnimator();
+            if( null != animator ) {
+                animator.stop(); // Avoiding a ThreadDeath of animator at shutdown
+            }
         }
     }
 }