This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit e1e799eec5ac99f9e64581980b835260c1795551
Author: Mihai Moldovan <io...@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 cd4a9b2..0c5017c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -258,6 +258,8 @@ x2goclient (4.0.5.3-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.
 
  -- X2Go Release Manager <git-ad...@x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
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
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

Reply via email to