[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - vcl/opengl

[Tor Lillqvist]

 vcl/opengl/win/WinDeviceInfo.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ccbc277d66589f1ffbf3c487634267bc6f64c470
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Aug 1 20:38:57 2016 +0300

    Look also for "RDPDD Chained DD"
    
    Apparently in some remote desktop situations the device string uses
    "RDPDD" and not "RDPUDD". No idea what the semantic difference is.
    
    Change-Id: I85532b90d759d02fffb73d0f3d22166aefd4edab
    (cherry picked from commit 1acd165eae7bf39ec89694fa85195b7e56278ef1)

diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index 773c52e..fd95da6 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -651,7 +651,8 @@ void WinOpenGLDeviceInfo::GetData()
     maDeviceString = displayDevice.DeviceString;
 
     if (maDeviceID.isEmpty() &&
-            maDeviceString == "RDPUDD Chained DD")
+        (maDeviceString == "RDPDD Chained DD" ||
+         (maDeviceString == "RDPUDD Chained DD")))
     {
         // we need to block RDP as it does not provide OpenGL 2.1+
         mbRDP = true;