Avoid some unnecessary processing when server side cursor isn't used (which

is the common case).

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

diff --git a/common/rfb/VNCSConnectionST.cxx b/common/rfb/VNCSConnectionST.cxx
index 84fc2ca1b388f77d2283d146369d58b8bafe7619..d73d753e2cbd72a53007d650c5da40534f78dbc6 100644 (file)
--- a/common/rfb/VNCSConnectionST.cxx
+++ b/common/rfb/VNCSConnectionST.cxx
@@ -285,7 +285,8 @@ int VNCSConnectionST::checkIdleTimeout()
 void VNCSConnectionST::renderedCursorChange()
 {
   if (state() != RFBSTATE_NORMAL) return;
-  removeRenderedCursor = true;
+  if (!renderedCursorRect.is_empty())
+    removeRenderedCursor = true;
   if (needRenderedCursor())
     drawRenderedCursor = true;
 }
@@ -565,7 +566,8 @@ void VNCSConnectionST::setInitialColourMap()
 void VNCSConnectionST::supportsLocalCursor()
 {
   if (cp.supportsLocalCursor || cp.supportsLocalXCursor) {
-    removeRenderedCursor = true;
+    if (!renderedCursorRect.is_empty())
+      removeRenderedCursor = true;
     drawRenderedCursor = false;
     setCursor();
   }