[X2Go-Commits] [x2gokdriveclient] 01/01: rootless mode: if updated window not found, considering it as a new one.

git-admin at x2go.org git-admin at x2go.org
Tue May 3 19:20:47 CEST 2022


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdriveclient.

commit f99c709b8837f7e1a7255773d8bce759362fe35a
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Tue May 3 12:20:35 2022 -0500

    rootless mode: if updated window not found, considering it as a new one.
---
 client.cpp       | 15 ++++++++++++---
 debian/changelog |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/client.cpp b/client.cpp
index 3ca751e..386787f 100644
--- a/client.cpp
+++ b/client.cpp
@@ -1144,14 +1144,23 @@ void Client::getWinUpdateBuffer()
         readFromBuf+=sizeof(uint8_t);
 
         ExtWin* win;
+        //if the window is not a new one, check if it exists in the list
         if(state!=2)
         {
             win=findExtWinById(extWinId);
             if(!win)
             {
-                KDRStdErr()<<"Error: update Wind "<<KDR_HEX<<extWinId<<" not found in the list"<<KDR_DEC<<KDR_ENDL;
-                freeMessageBuffer();
-                return;
+                if(state==3)
+                {
+                    KDRStdErr()<<"Error: deleted Window "<<KDR_HEX<<extWinId<<" not found in the list"<<KDR_DEC<<KDR_ENDL;
+                    freeMessageBuffer();
+                    return;
+                }
+                else
+                {
+                    KDRStdErr()<<KDR_ENDL<<KDR_ENDL<<"WARNING: updated Window "<<KDR_HEX<<extWinId<<" not found in the list, considering it as a new one"<<KDR_DEC<<KDR_ENDL<<KDR_ENDL<<KDR_ENDL;
+                    state=2;
+                }
             }
         }
         if(state==3)
diff --git a/debian/changelog b/debian/changelog
index fd5f94d..ac246c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,5 +49,6 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
     - reduce window updates when moving windows in rootless mode
     - remove resizeWinFromServer code
     - bring rootless window on top if server requesting
+    - rootless mode: if updated window not found, considering it as a new one.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 04 Jun 2019 11:10:43 +0200

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git


More information about the x2go-commits mailing list