This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit b5868aa9c44fb8066c6e79d38dfcd619b3079fa5 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 12 01:01:29 2015 +0100 onmainwindow.cpp: stop exporting directories (Printing, File Sharing) on sshd error. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4b012a3..7b28f15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -201,6 +201,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low - onmainwindow.cpp: consolidate Windows and non-Windows sshd startup error message. - onmainwindow.cpp: typo fix (authoized_keys.) + - onmainwindow.cpp: stop exporting directories (Printing, File Sharing) on + sshd error. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 13:25:28 +0100 diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 47c1cfa..f7fa74e 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -7559,6 +7559,12 @@ void ONMainWindow::exportDirs ( QString exports,bool removable ) dr.dirList=exports; dr.key=createRSAKey(); + + // Key creation failure or the like. + if (dr.key.isEmpty ()) { + return; + } + QString passwd; x2goDebug<<"Key created on: "<<dr.key; -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git