[X2Go-Commits] [x2goclient] 192/217: src/pulsemanager.cpp: fix startup when using the system-PA version.
git-admin at x2go.org
git-admin at x2go.org
Sat Aug 27 19:26:37 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 dc05e9df3b0b5a7f1ae4c5134c8be80cf926022f
Author: Mihai Moldovan <ionic at ionic.de>
Date: Wed Jun 22 04:13:44 2016 +0200
src/pulsemanager.cpp: fix startup when using the system-PA version.
---
debian/changelog | 1 +
src/pulsemanager.cpp | 23 ++++++++++++++---------
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9aa2245..2d8c5be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -353,6 +353,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
Don't just abort () the program.
- src/x2goutils.h: fix compile error due to typo.
- src/pulsemanager.cpp: fix compile error on Windows.
+ - src/pulsemanager.cpp: fix startup when using the system-PA version.
* debian/control:
- Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
- Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 1de1cc7..9582027 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -269,15 +269,20 @@ void PulseManager::start_generic () {
void PulseManager::start_osx () {
server_args_ = QStringList ();
server_args_ << "--exit-idle-time=-1" << "-n"
- << "-F" << pulse_dir_.absolutePath () + "/config.pa"
- << "-p"
- << QDir (app_dir_
- + "/../Frameworks/pulse-"
- + QString::number (pulse_version_major_)
- + "."
- + QString::number (pulse_version_minor_)
- + "/modules").absolutePath ()
- << "--high-priority";
+ << "-F" << pulse_dir_.absolutePath () + "/config.pa";
+
+ if (!system_pulse_) {
+ server_args_ << "-p"
+ << QDir (app_dir_
+ + "/../Frameworks/pulse-"
+ + QString::number (pulse_version_major_)
+ + "."
+ + QString::number (pulse_version_minor_)
+ + "/modules").absolutePath ();
+ }
+
+ server_args_ << "--high-priority";
+
if (debug_) {
server_args_ << "--log-level=debug"
<< "--verbose"
--
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