This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 63c9b862a806fa17a740d0d130232a138cb0b533
Author: Mihai Moldovan <io...@ionic.de>
Date: Fri Oct 30 03:16:52 2015 +0100
pulsemanager.cpp: add cleanup support to on_pulse_finished ().
---
debian/changelog | 1 +
src/pulsemanager.cpp | 12 ++++++++++++
2 files changed, 13 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index e34ebb2..9901592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -187,6 +187,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
functions.
- pulsemanager.{cpp,h}: new function create_client_dir ().
- pulsemanager.cpp: add Windows support to shutdown ().
+ - pulsemanager.cpp: add cleanup support to on_pulse_finished ().
[ Bernard Cafarelli ]
* New upstream version (4.0.5.3):
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 44b52f3..de73156 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -264,6 +264,18 @@ void PulseManager::on_pulse_finished (int exit_code) {
data = ba.data ();
std::cout << data;
+ // Clean up
+ QDir work_dir (app_dir_);
+
+#ifdef Q_OS_WIN
+ work_dir.remove (pulse_dir_.absolutePath ()
+ + "/pulse-pulseuser/pid");
+ work_dir.rmdir (pulse_dir_.absolutePath ()
+ + "/pulse-pulseuser");
+#endif // defined (Q_OS_WIN)
+
+ work_dir.rmdir (pulse_dir_.absolutePath ());
+
state_ = QProcess::NotRunning;
emit (sig_pulse_server_terminated ());
}
--
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
