summaryrefslogtreecommitdiffstats
path: root/common/rfb/VNCSConnectionST.cxx
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2009-05-28 12:47:51 +0000
committerPierre Ossman <ossman@cendio.se>2009-05-28 12:47:51 +0000
commita34d5555495723f71ff2e89533fdb19a4829db57 (patch)
tree41a6dd0bf6533204e68c1fbdf8ec4204b55aacc5 /common/rfb/VNCSConnectionST.cxx
parentcb2f46753d80593a0ff823361c186560e89b5782 (diff)
downloadtigervnc-a34d5555495723f71ff2e89533fdb19a4829db57.tar.gz
tigervnc-a34d5555495723f71ff2e89533fdb19a4829db57.zip
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/branches/1_0@3816 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'common/rfb/VNCSConnectionST.cxx')
-rw-r--r--common/rfb/VNCSConnectionST.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/common/rfb/VNCSConnectionST.cxx b/common/rfb/VNCSConnectionST.cxx
index 12cfab8c..e286cf31 100644
--- 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;
+ }
}
}
}