[X2Go-Commits] [x2goclient] 155/217: src/pulsemanager.cpp: let start () act as a wrapper and do nothing if the PA server is already running.
git-admin at x2go.org
git-admin at x2go.org
Sat Aug 27 19:26:05 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 97b384c3382d99c11d6f4c51486dfe9431fc0781
Author: Mihai Moldovan <ionic at ionic.de>
Date: Wed May 4 23:59:53 2016 +0200
src/pulsemanager.cpp: let start () act as a wrapper and do nothing if the PA server is already running.
---
debian/changelog | 2 ++
src/pulsemanager.cpp | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index b82095a..5c52b24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -291,6 +291,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
faulty) line for removed restart message.
- src/onmainwindow.cpp: fix compile errors due to misspelled function
names.
+ - src/pulsemanager.cpp: let start () act as a wrapper and do nothing if
+ the PA server is already running.
* debian/control:
- Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
- Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 93b9edb..98f2a97 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -105,7 +105,9 @@ PulseManager::~PulseManager () {
}
void PulseManager::start () {
- assert (!is_server_running ());
+ if (is_server_running ()) {
+ return;
+ }
delete (pulse_server_);
--
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