From d60fda117b1d72d12984a07a4444d36a69da639e Mon Sep 17 00:00:00 2001
From: dscho <dscho>
Date: Tue, 29 Oct 2002 16:04:24 +0000
Subject: fixed severe bug with sending fbupdates

---
 CHANGES     | 1 +
 main.c      | 3 ++-
 rfbserver.c | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2ce6420..b58f6d9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,4 @@
+   fixed severe bug (Const Kaplinsky)
    got patch from Const Kaplisnky with CursorPosUpdate encoding and some Docs
    sync'ed with newest RealVNC (ZRLE encoding)
    a HTTP request for tunnelling was added (to fool strict web proxies)
diff --git a/main.c b/main.c
index 0f4bf7d..ab4c149 100644
--- a/main.c
+++ b/main.c
@@ -766,7 +766,8 @@ rfbProcessEvents(rfbScreenInfoPtr rfbScreen,long usec)
   i = rfbGetClientIterator(rfbScreen);
   cl=rfbClientIteratorNext(i);
   while(cl) {
-    if(cl->sock>=0 && (!cl->onHold) && FB_UPDATE_PENDING(cl)) {
+    if (cl->sock >= 0 && !cl->onHold && FB_UPDATE_PENDING(cl) &&
+        !sraRgnEmpty(cl->requestedRegion)) {
       if(cl->screen->rfbDeferUpdateTime == 0) {
 	  rfbSendFramebufferUpdate(cl,cl->modifiedRegion);
       } else if(cl->startDeferring.tv_usec == 0) {
diff --git a/rfbserver.c b/rfbserver.c
index 9cdda1e..ecbc4e6 100644
--- a/rfbserver.c
+++ b/rfbserver.c
@@ -1101,7 +1101,7 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
      sraRgnSubtract(cl->modifiedRegion,updateRegion);
      sraRgnSubtract(cl->modifiedRegion,updateCopyRegion);
 
-     /* sraRgnMakeEmpty(cl->requestedRegion); */
+     sraRgnMakeEmpty(cl->requestedRegion);
      sraRgnMakeEmpty(cl->copyRegion);
      cl->copyDX = 0;
      cl->copyDY = 0;
-- 
cgit v1.2.3