FS-7306 #comment fix both ways

This commit is contained in:
Anthony Minessale committed 2015-02-20 18:10:01 -06:00
1 parent 1a181f0516
commit b66aa6af92
2 files changed
+10 -8

No files matched your search

@@ -190,6 +190,13 @@ static void *SWITCH_THREAD_FUNC timer_thread_run(switch_thread_t *thread, void *
pvt_t *pvt;
int samples = 160;
int ms = 20;
int r = 0;
if (switch_core_timer_init(&timer, "soft", ms, samples, NULL) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "timer init failed.\n");
r = -1;
goto end;
}
switch_mutex_lock(t38_state_list.mutex);
t38_state_list.thread_running = 1;
@@ -197,15 +204,9 @@ static void *SWITCH_THREAD_FUNC timer_thread_run(switch_thread_t *thread, void *
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FAX timer thread started.\n");
if (switch_core_timer_init(&timer, "soft", ms, samples, NULL) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "timer init failed.\n");
t38_state_list.thread_running = -1;
goto end;
}
switch_mutex_lock(spandsp_globals.cond_mutex);
while(t38_state_list.thread_running > 0) {
while(t38_state_list.thread_running == 1) {
switch_mutex_lock(t38_state_list.mutex);
@@ -234,7 +235,7 @@ static void *SWITCH_THREAD_FUNC timer_thread_run(switch_thread_t *thread, void *
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FAX timer thread ended.\n");
switch_mutex_lock(t38_state_list.mutex);
t38_state_list.thread_running = 0;
t38_state_list.thread_running = r;
switch_mutex_unlock(t38_state_list.mutex);
if (timer.timer_interface) {