[Commits] r6810 - icecast/trunk/icecast/src

[giles at dactyl.lonelymoon.com]

Author: giles
Date: Sun Jun  6 13:10:42 2004
New Revision: 6810

Modified:
icecast/trunk/icecast/src/source.c
Log:
Recommit of changes lost in the server migration
Original commit (r6810) 2004-06-04 03:15:36 -0400 (Fri, 04 Jun 2004) by msmith.

Fix #526. Fallbacks weren't being found when the primary was disconnected (for
newly-connecting clients).


Modified: icecast/trunk/icecast/src/source.c
===================================================================
--- icecast/trunk/icecast/src/source.c	2004-06-06 03:02:38 UTC (rev 6809)
+++ icecast/trunk/icecast/src/source.c	2004-06-06 03:08:19 UTC (rev 6810)
@@ -152,10 +152,8 @@
}

source = source_find_mount_raw(mount);
-        if (source == NULL)
-            break; /* fallback to missing mountpoint */

-        if (source->running)
+        if (source != NULL && source->running)
break;

/* source is not running, meaning that the fallback is not configured
@@ -737,7 +735,8 @@
}
thread_mutex_unlock(&source->queue_mutex);
client->burst_sent = 1;
-                    DEBUG1("Added %d buffers to initial client queue", refbuf_queue_length(&(source->queue)));
+                    DEBUG1("Added %d buffers to initial client queue",
+                            refbuf_queue_length(&(source->queue)));
}
}