From: Arun Raghavan <arun.raghavan@collabora.co.uk>
Date: Thu, 6 Oct 2011 09:06:50 +0000 (+0530)
Subject: echo-cancel: Don't crash if adjust_time = 0
X-Git-Tag: v1.99.1~259
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0429fe61537e1f3f184f16f9d7c128d159e41c7d;p=platform%2Fupstream%2Fpulseaudio.git

echo-cancel: Don't crash if adjust_time = 0
---

diff --git a/src/modules/echo-cancel/module-echo-cancel.c b/src/modules/echo-cancel/module-echo-cancel.c
index 325014a..9ecd787 100644
--- a/src/modules/echo-cancel/module-echo-cancel.c
+++ b/src/modules/echo-cancel/module-echo-cancel.c
@@ -404,7 +404,7 @@ static int source_set_state_cb(pa_source *s, pa_source_state_t state) {
     if (state == PA_SOURCE_RUNNING) {
         /* restart timer when both sink and source are active */
         u->active_mask |= 1;
-        if (u->active_mask == 3)
+        if (u->active_mask == 3 && u->adjust_time)
             pa_core_rttime_restart(u->core, u->time_event, pa_rtclock_now() + u->adjust_time);
 
         pa_atomic_store(&u->request_resync, 1);
@@ -432,7 +432,7 @@ static int sink_set_state_cb(pa_sink *s, pa_sink_state_t state) {
     if (state == PA_SINK_RUNNING) {
         /* restart timer when both sink and source are active */
         u->active_mask |= 2;
-        if (u->active_mask == 3)
+        if (u->active_mask == 3 && u->adjust_time)
             pa_core_rttime_restart(u->core, u->time_event, pa_rtclock_now() + u->adjust_time);
 
         pa_atomic_store(&u->request_resync, 1);