mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-11 20:17:05 +00:00
change switch_core_timer_next to return switch_status_t, update all users to new usage, add some error checking to mod_conference so that it bails out of the loops more gracefully on shutdown.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4454 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
1 parent
8f0b94435c
commit
ec3fcde87d
6 files changed
+16
-11
No files matched your search
+3
-3
@@ -1444,7 +1444,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
|
||||
|
||||
|
||||
if (timer_name) {
|
||||
if (switch_core_timer_next(&timer) < 0) {
|
||||
if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) {
|
||||
break;
|
||||
}
|
||||
} else { /* time off the channel (if you must) */
|
||||
@@ -1750,7 +1750,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text_handle(switch_core_session
|
||||
|
||||
if (switch_test_flag(sh, SWITCH_SPEECH_FLAG_PAUSE)) {
|
||||
if (timer) {
|
||||
if ((x = switch_core_timer_next(timer)) < 0) {
|
||||
if (switch_core_timer_next(timer) != SWITCH_STATUS_SUCCESS) {
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
@@ -1813,7 +1813,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text_handle(switch_core_session
|
||||
}
|
||||
|
||||
if (timer) {
|
||||
if ((x = switch_core_timer_next(timer)) < 0) {
|
||||
if (switch_core_timer_next(timer) != SWITCH_STATUS_SUCCESS) {
|
||||
break;
|
||||
}
|
||||
} else { /* time off the channel (if you must) */
|
||||
|
||||
Reference in new issue
Block a user