This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdriveclient. commit a4907119c1829f98b2642ddee90882943211be19 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Tue Aug 25 10:09:14 2020 -0500 give server some time for initialization before sending version. --- client.cpp | 9 +++------ client.h | 3 +-- debian/changelog | 1 + 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/client.cpp b/client.cpp index 565c30b..e5fd37e 100644 --- a/client.cpp +++ b/client.cpp @@ -1214,13 +1214,10 @@ void Client::socketConnected() if(geometry().width() != width || geometry().height() != height ) resize(width, height); - else - { - currentGeometry=geometry(); - sendGeometryEvent(); - } + currentGeometry=geometry(); + sendGeometryEvent(); - sendClientVersion(); + QTimer::singleShot(2000, this, SLOT(sendClientVersion())); if(fullscreen) { diff --git a/client.h b/client.h index 5aba47a..52d1cbf 100644 --- a/client.h +++ b/client.h @@ -171,6 +171,7 @@ public: private slots: + void sendClientVersion(); void slotIdentifyScreen(); void connectToServer(); void socketConnected(); @@ -224,8 +225,6 @@ private: void setCursor(); void sendGeometryEvent(); void setFS(int screenNumber); - void sendClientVersion(); - bool wantRepaint=false; diff --git a/debian/changelog b/debian/changelog index d4e2009..84f52c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,5 +24,6 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium - add xcb and xcb-fixes to deps. - add command line argument --selection (both|none|server|client) to specify selection mode. - send a recive feature versions. + - give server some time for initialization before sending version. -- Mike Gabriel <mike.gabriel@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