[X2Go-Commits] [x2goclient] 173/179: src/pulsemanager.cpp: fix typo in fetch_pulseaudio_version ().
git-admin at x2go.org
git-admin at x2go.org
Mon Jun 20 23:56:13 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 104620b68fd98202ac7c2eb17a3fa92b15bc75d2
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 6a1a59f..f3f388b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -314,6 +314,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.)
* debian/control:
- Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
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
More information about the x2go-commits
mailing list