diff options
| author | Xerxes Rånby <[email protected]> | 2014-02-25 14:36:22 +0100 |
|---|---|---|
| committer | Xerxes Rånby <[email protected]> | 2014-02-25 14:36:22 +0100 |
| commit | ac7de4a7b2cc939312cbeb88dd709a297c96c13c (patch) | |
| tree | 70c88d7d0094910af538518b23b00c6cc340ab83 /src/jogl/classes/jogamp | |
| parent | c67de337a8aaf52e36104c3f13e273aa19d21f1f (diff) | |
Bug 927: Try fix deadlock.
(14:15:13) sgothel: @Xerxes: In doResume .. do a 'while( !isActive && !shallPause && isRunning ) {'
(14:15:52) sgothel: doPause: while( isActive && !shallPause && isRunning )
(14:31:55) sgothel: doPause only: while( isActive && isRunning ) {
Diffstat (limited to 'src/jogl/classes/jogamp')
| -rw-r--r-- | src/jogl/classes/jogamp/opengl/util/av/GLMediaPlayerImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/jogl/classes/jogamp/opengl/util/av/GLMediaPlayerImpl.java b/src/jogl/classes/jogamp/opengl/util/av/GLMediaPlayerImpl.java index 7cea51dc8..6a0e0061f 100644 --- a/src/jogl/classes/jogamp/opengl/util/av/GLMediaPlayerImpl.java +++ b/src/jogl/classes/jogamp/opengl/util/av/GLMediaPlayerImpl.java @@ -1127,7 +1127,7 @@ public abstract class GLMediaPlayerImpl implements GLMediaPlayer { if( isBlocked && isActive ) { this.interrupt(); } - while( isActive ) { + while( isActive && isRunning ) { try { this.wait(); // wait until paused } catch (InterruptedException e) { @@ -1141,7 +1141,7 @@ public abstract class GLMediaPlayerImpl implements GLMediaPlayer { if( isRunning && !isActive ) { shallPause = false; if( Thread.currentThread() != this ) { - while( !isActive ) { + while( !isActive && !shallPause && isRunning ) { this.notifyAll(); // wake-up pause-block try { this.wait(); // wait until resumed |