Merge branch '1.6-master'

Fixed an error that happened in multi-screen environments

1 files changed, 7 insertions, 7 deletions

diff --git a/src/main/java/org/jogamp/java3d/JoglPipeline.java b/src/main/java/org/jogamp/java3d/JoglPipeline.java
index a7a05c7..f386f0b 100644
--- a/src/main/java/org/jogamp/java3d/JoglPipeline.java
+++ b/src/main/java/org/jogamp/java3d/JoglPipeline.java
@@ -6545,13 +6545,6 @@ class JoglPipeline extends Pipeline {
     	}
         else {
 
-        	// TODO can't find an implementation which avoids the use of QueryCanvas
-        	// JOGL requires a visible Frame for an onscreen context
-        	Frame f = new Frame();
-        	Dialog d = new Dialog(f);
-        	d.setUndecorated(true);
-        	d.setLayout(new BorderLayout());
-
         	ContextQuerier querier = new ContextQuerier(cv);
 
 		    AWTGraphicsConfiguration awtConfig =
@@ -6559,6 +6552,13 @@ class JoglPipeline extends Pipeline {
 
 		    QueryCanvas canvas = new QueryCanvas(awtConfig, querier);
 
+		    // TODO can't find an implementation which avoids the use of QueryCanvas
+        	// JOGL requires a visible Frame for an onscreen context
+        	Frame f = new Frame(canvas.getGraphicsConfiguration());
+        	Dialog d = new Dialog(f);
+        	d.setUndecorated(true);
+        	d.setLayout(new BorderLayout());
+		    
 		    d.add(canvas, BorderLayout.CENTER);
 		    d.setSize(MIN_FRAME_SIZE, MIN_FRAME_SIZE);
 		    d.setVisible(true);