This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/shadow-sessions-via-broker in repository x2goclient. commit 282be1c1b5362e1a3e27932e3bfbd960d1753a1f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Mar 19 02:06:10 2015 +0100 onmainwindow.cpp: fix desktop sharing via session broker. Fixes: #584. --- debian/changelog | 4 ++++ src/onmainwindow.cpp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6301aa0..7fa80a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -245,6 +245,10 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low - onmainwindow.cpp: fix bad quoting when writing remote xinerama config file. Fixes: #797. + [ Mike Gabriel ] + * New upstream release (4.0.4.0): + - onmainwindow.cpp: fix desktop sharing via session broker. Fixes: #584. + -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 13:25:28 +0100 x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 50db7b5..2a22be4 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -3063,7 +3063,7 @@ void ONMainWindow::continueNormalSession() { x2goDebug<<"Continue normal x2go session"; - if (brokerMode) + if (brokerMode && !shadowSession) { slotListSessions(true,QString::null,0); return; @@ -3469,7 +3469,7 @@ void ONMainWindow::slotListSessions ( bool result,QString output, } QStringList sessions; - if(!brokerMode) + if(!brokerMode || shadowSession) { sessions=output.trimmed().split ( '\n', QString::SkipEmptyParts ); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git