[X2Go-Commits] [x2goclient] 158/219: src/onmainwindow.cpp: make use of new PulseManager::start () behavior and always use it, no matter whether server is up already or not.
git-admin at x2go.org
git-admin at x2go.org
Thu Sep 22 04:37:11 CEST 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit cedc296f2ff9bbe046f8918105aabce854163fd5
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri May 6 23:45:55 2016 +0200
src/onmainwindow.cpp: make use of new PulseManager::start () behavior and always use it, no matter whether server is up already or not.
---
debian/changelog | 2 ++
src/onmainwindow.cpp | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 0b189e4..055b6ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -267,6 +267,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
- src/onmainwindow.cpp: fix compile error due to misuse of #ifdef.
- src/onmainwindow.cpp: convert QDir object to QString for further
processing.
+ - src/onmainwindow.cpp: make use of new PulseManager::start () behavior
+ and always use it, no matter whether server is up already or not.
-- X2Go Release Manager <git-admin at x2go.org> Mon, 19 Sep 2016 09:07:07 +0200
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index bedc3e3..6ea2dec 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -5067,7 +5067,11 @@ void ONMainWindow::slotRetResumeSess ( bool result,
true ).toBool();
#if defined (Q_OS_WIN) || defined (Q_OS_DARWIN)
- if ((sound) && (!(pulseManager->is_server_running ()))) {
+ if (sound) {
+ /*
+ * PulseManager::start () can be called even if the server
+ * is already started. In this case, it will do nothing.
+ */
pulseManager->start ();
}
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list