3 files changed, 55 insertions, 7 deletions

diff --git a/scilab/CHANGES_5.1 b/scilab/CHANGES_5.1
index eb70dfb..7466245 100644
--- a/scilab/CHANGES_5.1
+++ b/scilab/CHANGES_5.1
@@ -196,6 +196,8 @@ Bug fixes:
 
 * bug 3912 fixed - strsubst() used with regular expression may return very stange result.
 
+* bug 3919 fixed - scilab x64 doesn't display graphics from a remote desktop.
+
 * bug 3924 fixed - I used uicontrol with bad parameters, but uicontrol makes scilab hangs.
 
 Obsolete functions removed :
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3919.tst b/scilab/modules/graphics/tests/nonreg_tests/bug_3919.tst
new file mode 100644
index 0000000..9486509
--- /dev/null
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3919.tst
@@ -0,0 +1,30 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2008 - DIGITEO - Allan CORNET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+//
+// <-- Non-regression test for bug 3919 -->
+//
+
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=3919
+//
+// <-- Short Description -->
+// scilab x64 doesn't display graphics from a remote desktop
+
+// <-- INTERACTIVE TEST -->
+
+// install scilab x64 on windows
+// configure your remote desktop and connect to your pc
+// and launch scilab
+
+if ~msdos then pause,end
+if win64() <> %t then pause,end
+if istssession() <> %t then pause,end
+
+// try to do a plot or plot3d 
+// if you have a display it works
\ No newline at end of file
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
index e5ee76c..128e99e 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
@@ -93,18 +93,34 @@ public class SwingScilabCanvasImpl implements GLAutoDrawable, ImageObserver, Men
         tmpFrame.dispose();
         Debug.DEBUG("SwingScilabCanvasImpl", "Testing time = "+(Calendar.getInstance().getTimeInMillis() - lastTime)+"ms");
 
-        // If we are running on a Linux with Intel video card and with DRI activated
-        // GLJPanel will not be supported, so we force switch to GLCanvas.
         if (OS_NAME.contains("Linux")
                 && GL_RENDERER.contains("Intel")
-                && GL_RENDERER.contains("DRI"))
-        {
-            noGLJPanel = true;
+                && GL_RENDERER.contains("DRI")) {
+                        noGLJPanel = true;
         }
         else {
-            noGLJPanel = false;
+                if ( OS_NAME.contains("Windows") && OS_ARCH.equals("amd64") ) {
+                        // bug 3919 : JOGL x64 doesn't like x64 remote desktop on Windows
+                        // @TODO : bug report to JOGL
+                        String REMOTEDESKTOP = System.getenv("SCILAB_MSTS_SESSION");
+                        if (REMOTEDESKTOP != null) {
+                                if ( REMOTEDESKTOP.equals("OK") ) {
+                                        noGLJPanel = true;
+                                }
+                                else {
+                                        noGLJPanel = false;
+                                }
+                        }
+                        else {
+                                noGLJPanel = false;
+                        }
+                } 
+                else {
+                noGLJPanel = false;
+                }
+        }
+        
         }
-    }
 
     GLCanvas realGLCanvas;
     GLJPanel realGLJPanel;