[X2Go-Commits] [x2goclient] 107/197: pulsemanager.cpp: add cleanup support to on_pulse_finished ().
git-admin at x2go.org
git-admin at x2go.org
Thu Jun 30 23:53:07 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 7b00060d96ae2f46f9d41c849f1ca42f172e04f6
Author: Mihai Moldovan <ionic at 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 cbdad6a..f6ad770 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -214,6 +214,7 @@ x2goclient (4.0.5.2-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 ().
* 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 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
More information about the x2go-commits
mailing list