[X2Go-Commits] [x2goclient] 210/219: src/pulsemanager.cpp: fix PA version fetching on OS X again.

[git-admin at x2go.org]

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

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

commit 34a1149148ca1b6503d6d4e17a814f78849f291c
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Aug 12 08:55:34 2016 +0200

    src/pulsemanager.cpp: fix PA version fetching on OS X again.
---
 debian/changelog     |    1 +
 src/pulsemanager.cpp |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1efcdbf..00ffb8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -364,6 +364,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
       functions, paths are in native form (i.e., containing empty separators,
       instead of the "generic" slash UNIX-style separator.) Should fix a PA
       startup issue on Windows.
+    - src/pulsemanager.cpp: fix PA version fetching on OS X again.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 6170634..01677dd 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -419,7 +419,7 @@ void PulseManager::fetch_pulseaudio_version () {
               abort ();
             }
           }
-          else if (!(numbers_finished[1])) {
+          else if ((!(numbers_finished[1])) && (!(numbers_skip[1]))) {
             if (((*cit) >= '0') && ((*cit) <= '9')) {
               numbers[1].append (*cit);
               numbers_started[1] = true;
@@ -444,7 +444,7 @@ void PulseManager::fetch_pulseaudio_version () {
               abort ();
             }
           }
-          else if (!(numbers_finished[2])) {
+          else if ((!(numbers_finished[2])) && (!(numbers_skip[2]))) {
             if (((*cit) >= '0') && ((*cit) <= '9')) {
               numbers[2].append (*cit);
               numbers_started[2] = true;

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git