[X2Go-Commits] [x2goclient] 179/219: src/pulsemanager.cpp: don't remove PA config and log file in ~/.x2go/pulse on PA shutdown if debugging has been requested.

git-admin at x2go.org git-admin at x2go.org
Thu Sep 22 04:37:25 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 eff24adde41e67f8a297288376e2f7b5594f3530
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Jun 2 04:24:38 2016 +0200

    src/pulsemanager.cpp: don't remove PA config and log file in ~/.x2go/pulse on PA shutdown if debugging has been requested.
---
 debian/changelog     |    2 ++
 src/pulsemanager.cpp |   10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9dad033..fe4089b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -303,6 +303,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - src/pulsemanager.cpp: insert PULSE_SERVER and PULSE_COOKIE variables
       into environment as used by PulseManager. Otherwise we won't be able to
       start binaries like paplay.
+    - src/pulsemanager.cpp: don't remove PA config and log file in
+      ~/.x2go/pulse on PA shutdown if debugging has been requested.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 539b85b..ce7ba24 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -619,10 +619,12 @@ void PulseManager::slot_on_pulse_finished (int exit_code) {
 
 #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 ()));
-  work_dir.remove (QDir::toNativeSeparators (QDir (pulse_dir_.absolutePath ()
-                                                   + "/pulse.log").absolutePath ()));
+  if (!debug_) {
+    work_dir.remove (QDir::toNativeSeparators (QDir (pulse_dir_.absolutePath ()
+                                                     + "/config.pa").absolutePath ()));
+    work_dir.remove (QDir::toNativeSeparators (QDir (pulse_dir_.absolutePath ()
+                                                     + "/pulse.log").absolutePath ()));
+  }
 #else // Linux
   // FIXME.
 #endif

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