diff options
Diffstat (limited to 'src/jogl/classes/com')
| -rw-r--r-- | src/jogl/classes/com/jogamp/opengl/util/Animator.java | 11 | ||||
| -rw-r--r-- | src/jogl/classes/com/jogamp/opengl/util/FPSAnimator.java | 11 |
2 files changed, 14 insertions, 8 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/util/Animator.java b/src/jogl/classes/com/jogamp/opengl/util/Animator.java index 4d61adaa6..c7a03eddb 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/Animator.java +++ b/src/jogl/classes/com/jogamp/opengl/util/Animator.java @@ -237,11 +237,14 @@ public class Animator extends AnimatorBase { stopIssued = false; pauseIssued = false; isAnimating = false; - if( null != displayCaught ) { - handleUncaughtException(displayCaught); + try { + if( null != displayCaught ) { + handleUncaughtException(displayCaught); // may throw exception if null handler + } + } finally { + animThread = null; + Animator.this.notifyAll(); } - animThread = null; - Animator.this.notifyAll(); } } } diff --git a/src/jogl/classes/com/jogamp/opengl/util/FPSAnimator.java b/src/jogl/classes/com/jogamp/opengl/util/FPSAnimator.java index ec6c8aae7..dc4a9a896 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/FPSAnimator.java +++ b/src/jogl/classes/com/jogamp/opengl/util/FPSAnimator.java @@ -232,11 +232,14 @@ public class FPSAnimator extends AnimatorBase { } } isAnimating = false; - if( null != displayCaught ) { - handleUncaughtException(displayCaught); + try { + if( null != displayCaught ) { + handleUncaughtException(displayCaught); // may throw exception if null handler + } + } finally { + animThread = null; + FPSAnimator.this.notifyAll(); } - animThread = null; - FPSAnimator.this.notifyAll(); } } } |