[pulseaudio-commits] src/modules

[Tanu Kaskinen]

 src/modules/module-combine-sink.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4bd39f950155be98821a9072bcafed7fccca1a7d
Author: Hemanth Meenakshisundaram <hemanth at highfive.com>
Date:   Sun Apr 20 17:30:07 2014 -0700

    combine-sink: fix zero adjust_time behaviour.
    
    A value of 0 for adjust_time should disable rate adjustment.
    Fix a bug where a 0 value causes rate adjustment to be called
    continuously instead after an unsuspend event.

diff --git a/src/modules/module-combine-sink.c b/src/modules/module-combine-sink.c
index deabceb..ccb2a49 100644
--- a/src/modules/module-combine-sink.c
+++ b/src/modules/module-combine-sink.c
@@ -610,7 +610,7 @@ static void unsuspend(struct userdata *u) {
     PA_IDXSET_FOREACH(o, u->outputs, idx)
         output_enable(o);
 
-    if (!u->time_event)
+    if (!u->time_event && u->adjust_time > 0)
         u->time_event = pa_core_rttime_new(u->core, pa_rtclock_now() + u->adjust_time, time_callback, u);
 
     pa_log_info("Resumed successfully...");