We should only send ExtendedDesktopSize to a client supporting both it and

the old DesktopSize.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3817 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/common/rfb/VNCSConnectionST.cxx b/common/rfb/VNCSConnectionST.cxx
index 12cfab8cad5a6e929ba41d3767a163167d0b00ad..e286cf315b2a7bcfee555df37db6e923dfd6d6d8 100644 (file)
--- a/common/rfb/VNCSConnectionST.cxx
+++ b/common/rfb/VNCSConnectionST.cxx
@@ -171,10 +171,12 @@ void VNCSConnectionST::pixelBufferChange()
       cp.height = server->pb->height();
       cp.screenLayout = server->screenLayout;
       if (state() == RFBSTATE_NORMAL) {
-        if (!writer()->writeSetDesktopSize() &&
-            !writer()->writeExtendedDesktopSize()) {
-          close("Client does not support desktop resize");
-          return;
+        // We should only send EDS to client asking for both
+        if (!writer()->writeExtendedDesktopSize()) {
+          if (!writer()->writeSetDesktopSize()) {
+            close("Client does not support desktop resize");
+            return;
+          }
         }
       }
     }