[X2Go-Commits] [x2goclient] 108/139: pulsemanager.cpp: add cleanup support to on_pulse_finished ().
git-admin at x2go.org
git-admin at x2go.org
Wed Jan 13 18:42:20 CET 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 7c5f3153b24385a3ed07a03dcce837885b468ffc
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 22048a7..4ccfb21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -195,6 +195,7 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
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:
- Change apache2-dev | libc6-dev build dependency back to apache2-dev
only. Otherwise, apache2-dev is not installed at all, even though
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