From feebfdea24f8ac98282751824aa4d3569bb71d93 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 1 Feb 2013 12:41:53 +0100
Subject: Fix Animator resume() wait-condition (drawablesEmpty didn't wait for
 pausedIssued); Update TestGLWindows02NEWTAnimated (isPaused())

---
 src/jogl/classes/com/jogamp/opengl/util/Animator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/jogl/classes/com/jogamp')

diff --git a/src/jogl/classes/com/jogamp/opengl/util/Animator.java b/src/jogl/classes/com/jogamp/opengl/util/Animator.java
index 22832f6bd..673ec895e 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/Animator.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/Animator.java
@@ -307,7 +307,7 @@ public class Animator extends AnimatorBase {
     private final Condition waitForPausedCondition = new Condition() {
         public boolean eval() {
             // end waiting if stopped as well
-            return isAnimating && isStartedImpl();
+            return isStartedImpl() && isAnimating;
         } };
 
     public synchronized boolean resume() {
@@ -320,6 +320,6 @@ public class Animator extends AnimatorBase {
     private final Condition waitForResumeCondition = new Condition() {
         public boolean eval() {
             // end waiting if stopped as well
-            return !drawablesEmpty && !isAnimating && isStartedImpl();
+            return isStartedImpl() && ( !drawablesEmpty && !isAnimating || drawablesEmpty && !pauseIssued ) ;
         } };
 }
-- 
cgit v1.2.3