Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio

1 files changed, 6 insertions, 4 deletions

diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c
index 550b6571..27f24cd1 100644
--- a/src/pulsecore/source-output.c
+++ b/src/pulsecore/source-output.c
@@ -542,10 +542,12 @@ pa_usec_t pa_source_output_set_requested_latency(pa_source_output *o, pa_usec_t
     /* If this source output is not realized yet or is being moved, we
      * have to touch the thread info data directly */
 
-    pa_source_get_latency_range(o->source, &min_latency, &max_latency);
+    if (o->source) {
+        pa_source_get_latency_range(o->source, &min_latency, &max_latency);
 
-    if (usec != (pa_usec_t) -1)
-        usec = PA_CLAMP(usec, min_latency, max_latency);
+        if (usec != (pa_usec_t) -1)
+            usec = PA_CLAMP(usec, min_latency, max_latency);
+    }
 
     o->thread_info.requested_source_latency = usec;
 
@@ -745,7 +747,7 @@ int pa_source_output_finish_move(pa_source_output *o, pa_source *dest, pa_bool_t
         new_resampler = NULL;
 
     if (o->moving)
-        o->moving(o);
+        o->moving(o, dest);
 
     o->source = dest;
     o->save_source = save;