This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 937727a8b7990ce3441f77a355ad143aca25908c Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Wed Jun 9 10:44:46 2021 -0500 Don't exit if connection to HTTP broker is failed when sync sessions. --- debian/changelog | 1 + src/httpbrokerclient.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7c6f078..e7c8a85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - Don't close X2Go Client if settings dialog is called before broker auth. - X2Go Client will send it's OS name to the broker when sending client event. + - Don't exit if connection to HTTP broker is failed when sync sessions. [ Ryan Schmidt ] * New upstream version (4.1.2.3): diff --git a/src/httpbrokerclient.cpp b/src/httpbrokerclient.cpp index da3f710..fa66613 100644 --- a/src/httpbrokerclient.cpp +++ b/src/httpbrokerclient.cpp @@ -655,10 +655,13 @@ void HttpBrokerClient::slotRequestFinished ( QNetworkReply* reply ) { x2goDebug<<"Broker HTTP request failed with error: "<<reply->errorString(); mainWindow->setBrokerStatus(tr("Disconnected from broker: ")+reply->errorString(), true); - if(reply == eventRequest) + if(reply == eventRequest || reply == sessionsRequest) { reply->deleteLater(); - eventRequest=0l; + if(reply == eventRequest) + eventRequest=0l; + else + sessionsRequest=0l; //do not exit, just return the function return; } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git