aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2005-03-08 02:51:15 +0000
committerWarren Dukes <warren.dukes@gmail.com>2005-03-08 02:51:15 +0000
commita849136820badac142c299abfc8cfe65fbd64896 (patch)
treeab1b12ed993570f21da16b28bfbf0c1f42c5b965
parentb5e55a648f12cea229f49c00730ef11a8583b66b (diff)
downloadmpd-a849136820badac142c299abfc8cfe65fbd64896.tar.gz
mpd-a849136820badac142c299abfc8cfe65fbd64896.tar.xz
mpd-a849136820badac142c299abfc8cfe65fbd64896.zip
undo fix for killall not preserving the current format properly, it causes problems for alsa and other things that spawn extra process w/o us knowing
git-svn-id: https://svn.musicpd.org/mpd/trunk@3039 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--src/decode.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/decode.c b/src/decode.c
index 32deb075a..b0e08dc34 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -52,8 +52,11 @@ void decodeSigHandler(int sig, siginfo_t * si, void * v) {
*decode_pid = 0;
}
}
- else if(sig==SIGTERM && si->si_pid==getppid()) {
- DEBUG("player/decoder got SIGTERM from parent process\n");
+ /* this is causing problems for alsa and other things that generate
+ * extra processes. it causes them to not die */
+ /*else if(sig==SIGTERM && si->si_pid==getppid()) {
+ DEBUG("player/decoder got SIGTERM from parent process\n");*/
+ else if(sig==SIGTERM) {
if(decode_pid) {
int pid = *decode_pid;
if(pid>0) kill(pid,SIGTERM);