VideoArea parameter is fully respected. The server treats the specified rectangle...

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

diff --git a/common/rfb/VNCServerST.cxx b/common/rfb/VNCServerST.cxx
index e9544780e74c40e4b64e3195e7872324cf4d7ada..6d21c7b2393620a5ea90d167531e382a5c4dd508 100644 (file)
--- a/common/rfb/VNCServerST.cxx
+++ b/common/rfb/VNCServerST.cxx
@@ -570,11 +570,14 @@ void VNCServerST::unsetVideoRectangle()
   if (isVideoSelectionEnabled()) {
     // FIXME: Duplication between m_videoRect and comparer->video_area.
     m_videoRect.clear();
-    set_video_area(m_videoRect);
+    set_video_area(m_defaultVideoRect);
   }
 }
 
 void VNCServerST::setDefaultVideoRect(const Rect& r)
 {
   m_defaultVideoRect = r;
+  if (m_videoRect.is_empty()) {
+    set_video_area(m_defaultVideoRect);
+  }
 }