This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit dac87fe3be75ec15f879ff37b4d23e4eed45d00f Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Wed Aug 22 11:07:50 2018 +0200 Save session command in resumingSession.command. --- debian/changelog | 1 + src/httpbrokerclient.cpp | 2 +- src/onmainwindow.cpp | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b0c0449..6456828 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium option events=bool. If true, client sending to broker events: CONNECTING, CONNECTED, SUSPENDING, TERMINATING, FINISHED. It's not a real session state, but rather the state of X2Go Client. + - Save session command in resumingSession.command. [ Mihai Moldovan ] * New upstream version (4.1.2.2): diff --git a/src/httpbrokerclient.cpp b/src/httpbrokerclient.cpp index ea5158e..21cb14f 100644 --- a/src/httpbrokerclient.cpp +++ b/src/httpbrokerclient.cpp @@ -386,7 +386,7 @@ void HttpBrokerClient::sendEvent(const QString& ev, const QString& id, const QSt } else { sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser + " --task clientevent --sid \""+id+"\" --event "+ev+" --server \""+server+"\" --client \""+client+"\" --login "+"\""+ - login+"\" --cmd \""+cmd+"\" --display\" "+display+" \" --start \""+start+"\"", + login+"\" --cmd \""+cmd+"\" --display \""+display+"\" --start \""+start+"\"", this,SLOT ( slotEventSent(bool,QString,int))); } } diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index d547248..d530745 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -4230,6 +4230,7 @@ void ONMainWindow::startNewSession() usekbd=true; } } + resumingSession.command=command; if ( command=="RDP" ) { if (fullscreen) { @@ -6938,6 +6939,9 @@ void ONMainWindow::SlotRunCommand(bool, QString output, int) rootless=config.rootless; resumingSession.published=config.published; } + + resumingSession.command=command; + if ( rootless ) sessionType="R"; if ( resumingSession.published ) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git