X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=0299521267dd802ccd5024467a15590fb286ed22;hb=5ae04ac2ef54f6f164a797c16c9782042cc2ce67;hp=d5bd45b4d6034cda46c09d7bfd749402df5a0a18;hpb=84a3ee86461e2311032274e0b7d7a857e02a76ab;p=rocksndiamonds.git diff --git a/src/libgame/sound.c b/src/libgame/sound.c index d5bd45b4..02995212 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -299,7 +299,7 @@ void UnixCloseAudio(void) if (audio.device_fd) close(audio.device_fd); - if (IS_PARENT_PROCESS()) + if (IS_PARENT_PROCESS() && HAS_CHILD_PROCESS()) kill(audio.mixer_pid, SIGTERM); } @@ -1834,7 +1834,7 @@ void InitSoundList(struct ConfigInfo *config_list, int num_file_list_entries, sound_info->num_dynamic_file_list_entries = 0; sound_info->file_list = - getFileListFromConfigList(config_list, config_suffix_list, + getFileListFromConfigList(config_list, config_suffix_list, ignore_tokens, num_file_list_entries); sound_info->dynamic_file_list = NULL;