This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 093543e62d00d8b0dcfb36798fa48bd8757fb17e Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Fri Jun 27 10:33:43 2014 +0200 Fix running x2goclient without arguments on Windows. (Fixes: #522). --- debian/changelog | 1 + ongetpass.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 349f8ea..e756295 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ x2goclient (4.0.2.1-0x2go1) UNRELEASED; urgency=low - Check if sound is activated before starting pulse. - Fix starting sshd on Win XP. (Fixes: #421). - Fork x2goclient on windows and terminate child processes if x2go client crashed. + - Fix running x2goclient without arguments on Windows. (Fixes: #522). - Save proxy output in $HOME/S-$SESSION-ID/session.log if debugging is enabled. [ Mike DePaulo ] * New upstream release (4.0.2.1): diff --git a/ongetpass.cpp b/ongetpass.cpp index 340ae2b..3d65b2e 100644 --- a/ongetpass.cpp +++ b/ongetpass.cpp @@ -96,7 +96,6 @@ void enumerateFromParent(DWORD pid) int x2goMain ( int argc, char *argv[] ) { - QApplication app ( argc,argv ); #ifndef Q_WS_HILDON @@ -152,6 +151,10 @@ int x2goMain ( int argc, char *argv[] ) else { #ifdef Q_OS_WIN + if(argc <=1) + { + args=app.arguments(); + } if(args.count()<2 || args[1].indexOf("--child-process")==-1) { QProcess proc; -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git