[X2Go-Commits] [x2goclient] 261/281: src/pulsemanager.cpp: fix PA binary searching logic.
git-admin at x2go.org
git-admin at x2go.org
Thu Jan 19 13:06:17 CET 2017
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit e5bac32a1d896ee59770accb3c1f7565b23c8bca
Author: Mihai Moldovan <ionic at ionic.de>
Date: Mon Nov 28 18:09:53 2016 +0100
src/pulsemanager.cpp: fix PA binary searching logic.
We don't want to unconditionally set system_pulse_ to true if we found a
binary... it might as well be the bundled one...
---
debian/changelog | 3 +++
src/pulsemanager.cpp | 17 ++++++++++++++---
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d1bad86..92217b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -498,6 +498,9 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
duplication now.
- src/onmainwindow.cpp: fix sshd_config generation on UNIX by searching
for the real sftp-server binary path.
+ - src/pulsemanager.cpp: fix PA binary searching logic. We don't want to
+ unconditionally set system_pulse_ to true if we found a binary... it
+ might as well be the bundled one...
[ Bernard Cafarelli ]
* New upstream version (4.0.5.3):
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index d7b6d72..a956054 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -79,6 +79,10 @@ PulseManager::PulseManager () : app_dir_ (QApplication::applicationDirPath ()),
if (server_binary_.isEmpty ()) {
server_binary_ = find_binary (path_val, "pulseaudio");
+
+ if (!(server_binary_.isEmpty ())) {
+ system_pulse_ = true;
+ }
}
#else /* QT_VERSION < 0x050000 */
QStringList search_paths;
@@ -102,8 +106,18 @@ PulseManager::PulseManager () : app_dir_ (QApplication::applicationDirPath ()),
search_paths << "/usr/local/bin"; /* Homebrew or random stuff. Probably even both intermingled... */
server_binary_ = QStandardPaths::findExecutable ("pulseaudio", search_paths);
+
+ if (!(server_binary_.isEmpty ())) {
+ system_pulse_ = true;
+ }
+ }
+ else {
+ system_pulse_ = true;
}
}
+ else {
+ system_pulse_ = true;
+ }
}
#endif /* QT_VERSION < 0x050000 */
@@ -118,9 +132,6 @@ PulseManager::PulseManager () : app_dir_ (QApplication::applicationDirPath ()),
true);
abort ();
}
- else {
- system_pulse_ = true;
- }
QFileInfo tmp_file_info = QFileInfo (server_binary_);
server_working_dir_ = tmp_file_info.canonicalPath ();
--
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