diff options
| author | Sven Gothel <[email protected]> | 2014-02-25 17:17:31 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-02-25 17:17:31 +0100 |
| commit | 64bdefac9191334ace292683a6a7c4274bc3f72b (patch) | |
| tree | d388d1081c114d181004caec12ff424395cae5af /src/jogl | |
| parent | c3621221b9a563495b4f54fe60e18e8db8cc57fb (diff) | |
| parent | c2e6233c57f47c067dbb24f4a6a127fbaedf7a08 (diff) | |
Merge branch 'master' into 2.2-train
Diffstat (limited to 'src/jogl')
3 files changed, 7 insertions, 7 deletions
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java index abf670c95..09589080f 100644 --- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java +++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java @@ -818,9 +818,9 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable, WindowClosing printActive = false; return; // not yet available .. } - if( !isShowing ) { + if( !isVisible() ) { if(DEBUG) { - System.err.println(getThreadName()+": Info: GLCanvas setupPrint - skipped GL render, drawable valid, canvas not showing"); + System.err.println(getThreadName()+": Info: GLCanvas setupPrint - skipped GL render, canvas not visible"); } printActive = false; return; // not yet available .. diff --git a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java index adc0a0d23..fbd923a3b 100644 --- a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java +++ b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java @@ -437,7 +437,7 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable, WindowClosing @Override public void display() { - if( isShowing ) { + if( isShowing || ( printActive && isVisible() ) ) { if (EventQueue.isDispatchThread()) { // Want display() to be synchronous, so call paintImmediately() paintImmediately(0, 0, getWidth(), getHeight()); @@ -627,9 +627,9 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable, WindowClosing printActive = false; return; // not yet available .. } - if( !isShowing ) { + if( !isVisible() ) { if(DEBUG) { - System.err.println(getThreadName()+": Info: GLJPanel setupPrint - skipped GL render, drawable valid, panel not showing"); + System.err.println(getThreadName()+": Info: GLJPanel setupPrint - skipped GL render, panel not visible"); } printActive = false; return; // not yet available .. 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 |