[X2Go-Commits] [x2goclient] 158/179: 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
Mon Jun 20 23:56:07 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 70cd9ceb8ef7ea96e73635327274d93fc87a8bff
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 60b2199..3b4db22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -292,6 +292,8 @@ x2goclient (4.0.5.2-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.
* debian/control:
- Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 89a5e5a..64c08f9 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