Merge 07ebb73882 into 96de8fd377

[core] Make sure end the audio absorbing thread
2025-01-16 16:15:41 +00:00 · 2020-08-23 09:27:41 +08:00
2 changed files with 2 additions and 2 deletions
--- a/src/switch_core.c
+++ b/src/switch_core.c
@ -515,7 +515,7 @@ static void *SWITCH_THREAD_FUNC switch_core_service_thread(switch_thread_t *thre
 	channel = switch_core_session_get_channel(session);

 	switch_channel_set_flag(channel, CF_SERVICE);
-	while (switch_channel_test_flag(channel, CF_SERVICE)) {
+	while (switch_channel_test_flag(channel, CF_SERVICE) && switch_channel_up_nosig(channel)) {

 		if (switch_channel_test_flag(channel, CF_SERVICE_AUDIO)) {
 			switch (switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0)) {
--- a/src/switch_ivr_play_say.c
+++ b/src/switch_ivr_play_say.c
@ -2057,7 +2057,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
 		switch_core_codec_destroy(&codec);
 	}

-	if (timer.samplecount) {
+	if (timer_name) {
 		/* End the audio absorbing thread */
 		switch_core_thread_session_end(session);
 		switch_core_timer_destroy(&timer);
Author	SHA1	Message	Date
贵永冬	0202f99cab	Merge `07ebb73882` into `96de8fd377`	2025-01-16 16:15:41 +00:00
贵永冬	07ebb73882	[core] Make sure end the audio absorbing thread	2020-08-23 09:27:41 +08:00