[X2Go-Commits] [x2goclient] 173/173: src/pulsemanager.cpp: fix typo in fetch_pulseaudio_version ().

[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 f995a9f7081d2b04ca0e811c2c034b85c4836887
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu May 12 23:45:16 2016 +0200

    src/pulsemanager.cpp: fix typo in fetch_pulseaudio_version ().
    
    Read standard output from temporary process, not our "main" server
    process (which at this point is not even started yet.)
---
 debian/changelog     |    3 +++
 src/pulsemanager.cpp |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 91cd5bf..41a2514 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -310,6 +310,9 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
     - macbuild.sh: don't error out while executing parse_otool_output ().
     - macbuild.sh: save return value of parse_otool_output (). Otherwise we'll
       fetch the return value of "set", which is not really what we need.
+    - src/pulsemanager.cpp: fix typo in fetch_pulseaudio_version (). Read
+      standard output from temporary process, not our "main" server process
+      (which at this point is not even started yet.)
 
   [ Mike DePaulo ]
   * New upstream release (4.0.5.2):
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index ee6c63c..d19494d 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -241,7 +241,7 @@ void PulseManager::fetch_pulseaudio_version () {
   /* Wait until the process exited again. */
   if (tmp_server.waitForFinished ()) {
     /* Read stdout and split it up on newlines. */
-    QByteArray ba (pulse_server_->readAllStandardOutput ());
+    QByteArray ba (tmp_server.readAllStandardOutput ());
     QString stdout_data (ba.data ());
     QStringList stdout_list (stdout_data.split ("\n"));
 

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