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

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

commit 7883e4ddcdfd11663ed301dc88f7c269cb935218
Author: Mihai Moldovan <io...@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 118501e..d9389ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -289,6 +289,9 @@ x2goclient (4.0.5.3-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.)
 
  -- 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 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
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

Reply via email to