[xiph-commits] r15894 - icecast/trunk/ices/src

[karl at svn.xiph.org]

Author: karl
Date: 2009-03-31 19:29:25 -0700 (Tue, 31 Mar 2009)
New Revision: 15894

Modified:
   icecast/trunk/ices/src/stream.c
Log:
a reconnectattempts value of 0 was not handled properly. closes #735


Modified: icecast/trunk/ices/src/stream.c
===================================================================
--- icecast/trunk/ices/src/stream.c	2009-04-01 01:48:13 UTC (rev 15893)
+++ icecast/trunk/ices/src/stream.c	2009-04-01 02:29:25 UTC (rev 15894)
@@ -293,6 +293,8 @@
                     
                     shout_close(sdsc->shout);
 
+                    if (i >= stream->reconnect_attempts)
+                        break;
                     while((i < stream->reconnect_attempts ||
                             stream->reconnect_attempts==-1) && 
                             !ices_config->shutdown)
@@ -313,6 +315,7 @@
                             thread_mutex_lock(&ices_config->flush_lock);
                             stream->wait_for_critical = 1;
                             input_flush_queue(stream->queue, 0);
+                            stream->skip = 0;
                             thread_mutex_unlock(&ices_config->flush_lock);
                             break;
                         }
@@ -332,7 +335,6 @@
                                 thread_sleep (stream->reconnect_delay*1000000); 
                         }
                     }
-                    stream->skip = 0;
                 }
                 stream->buffer_failures++;
             }