Hi Alex,does the below commit fix any bug in X2Go BTS? There were some discussions about such issues and I am not sure if we have that in BTS.
If there is an open bug for the issue, please tag the bug as pending and mention that in the changelog.
Greets, Mike On Do 04 Apr 2013 11:38:26 CEST X2Go dev team wrote:
The branch, master has been updated via 2419bf34d1ecd28696e6c129001057c4de77a328 (commit) from 036222619b0e93c7dce07204a5b04ad60e689c49 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2419bf34d1ecd28696e6c129001057c4de77a328 Author: Oleksandr Shneyder <o.shney...@phoca-gmbh.de> Date: Thu Apr 4 11:38:20 2013 +0200 waiting for x2gocmdexitmessage to return before closing in hidden mode ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + onmainwindow.cpp | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 227a7af..dbe9045 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low [ Oleksandr Shneyder ] * Use "127.0.0.1" instead of localhost to avoid wrong IPv6 hostname resolution. (Fixes: #151). + - waiting for x2gocmdexitmessage to return before closing in hidden mode-- Mike Gabriel <mike.gabr...@das-netzwerkteam.de> Fri, 22 Mar 2013 23:21:11 +0100diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 840a699..dbcb092 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp@@ -5284,9 +5284,11 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus )delete sshConnection; x2goDebug<<"done"<<endl; sshConnection=0; + if ( startHidden ) + { + close(); + } } - if ( startHidden ) - close(); if ( readExportsFrom!=QString::null ) {@@ -8270,9 +8272,6 @@ void ONMainWindow::slotCmdMessage ( bool result,QString output,passForm->setEnabled ( true ); pass->setFocus(); pass->selectAll(); - delete sshConnection; - sshConnection=0; - return; } if ( output.indexOf ( "X2GORUNCOMMAND ERR NOEXEC:" ) !=-1 ) {@@ -8283,8 +8282,13 @@ void ONMainWindow::slotCmdMessage ( bool result,QString output,cmd,QMessageBox::Ok, QMessageBox::NoButton ); } - delete sshConnection; + if(sshConnection) + delete sshConnection; sshConnection=0; + if ( startHidden ) + { + close(); + } } hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client). _______________________________________________ X2Go-commits mailing list x2go-comm...@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-commits
-- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabr...@das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb
pgp9_dkul1NTI.pgp
Description: Digitale PGP-Unterschrift
_______________________________________________ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
