This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 14d2cf0ffb695256af4e7a081e8de372bb8fd0d9
Author: Mihai Moldovan <io...@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 e7d42ad..e8e28a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -326,6 +326,7 @@ x2goclient (4.0.5.3-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.
[ Bernard Cafarelli ]
* New upstream version (4.0.5.3):
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
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits
