[X2Go-Commits] [x2goclient] 115/179: pulsemanager.cpp: only play startup sound if DEBUG macro is defined.
git-admin at x2go.org
git-admin at x2go.org
Mon Jun 20 23:55:43 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 2e4b4c55eaf668f39d350c73b68d21aec6c3633f
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri Oct 30 03:45:49 2015 +0100
pulsemanager.cpp: only play startup sound if DEBUG macro is defined.
---
debian/changelog | 1 +
src/pulsemanager.cpp | 2 ++
2 files changed, 3 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index a48cf99..e09d67d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -222,6 +222,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
- pulsemanager.cpp: also load module-esound-protocol-tcp module.
- pulsemanager.cpp: make generate_server_config () Windows-compatible.
- pulsemanager.cpp: make generate_client_config () Windows-compatible.
+ - pulsemanager.cpp: only play startup sound if DEBUG macro is defined.
* debian/control:
- Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 5e66e44..421e54b 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -292,6 +292,7 @@ void PulseManager::create_client_dir () {
}
void PulseManager::slot_play_startup_sound () {
+#ifdef DEBUG
QProcess play_file (0);
play_file.setWorkingDirectory (pulse_server_->workingDirectory ());
@@ -301,6 +302,7 @@ void PulseManager::slot_play_startup_sound () {
if (play_file.waitForStarted ())
play_file.waitForFinished ();
+#endif // defined (DEBUG)
}
void PulseManager::on_pulse_finished (int exit_code) {
--
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