[X2Go-Commits] [x2goclient] 141/217: pulsemanager.cpp: remove config.pa while doing post-exit cleanups.

git-admin at x2go.org git-admin at x2go.org
Sat Aug 27 19:25:51 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 9825ec6f038f85046616726d346e354db17334ca
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Mar 31 22:54:47 2016 +0200

    pulsemanager.cpp: remove config.pa while doing post-exit cleanups.
---
 debian/changelog     |    1 +
 src/pulsemanager.cpp |    8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3d43d29..da62c44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -269,6 +269,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
     - macbuild.sh: PulseAudio has been updated to version 8.0. Reflect this.
     - macbuild.sh: libpulsecore.dylib also resides in the "private" pulseaudio
       subdirectory now, adding it to "special files workaround".
+    - pulsemanager.cpp: remove config.pa while doing post-exit cleanups.
   * 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 9a70e5d..0d20ed1 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -524,6 +524,14 @@ void PulseManager::on_pulse_finished (int exit_code) {
                   + "/pulse-pulseuser");
 #endif // defined (Q_OS_WIN)
 
+#if defined (Q_OS_DARWIN) || defined (Q_OS_WIN)
+  // Remove server config file, otherwise the directory won't be empty.
+  work_dir.remove (QDir::toNativeSeparators (QDir (pulse_dir_.absolutePath ()
+                                                   + "/config.pa").absolutePath ()));
+#else // Linux
+  // FIXME.
+#endif
+
   work_dir.rmdir (pulse_dir_.absolutePath ());
 
   state_ = QProcess::NotRunning;

--
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