Use <= when comparing (current time - start time) to a timeout. This way

if the clock ticks right after we get the start time and the timeout is only one second, we'll still wait a full second instead of returning immediately. git-svn-id: https://svn.musicpd.org/mpd/trunk@6557 09075e82-0dd4-0310-85a5-a0d7c8717e4f

Use <= when comparing (current time - start time) to a timeout. This way
8de17dbe · J. Alexander Treuman · 6f2be472 · 8de17dbe
Commit 8de17dbe authored Jun 12, 2007 by J. Alexander Treuman
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

audioOutput_shout.c src/audioOutputs/audioOutput_shout.c +2 -2

No files found.
--- a/src/audioOutputs/audioOutput_shout.c
+++ b/src/audioOutputs/audioOutput_shout.c
@@ -453,7 +453,7 @@ static int myShout_openShoutConn(AudioOutput * audioOutput)
 	int state;

 	if (sd->connAttempts != 0 &&
-	    (t - sd->lastAttempt) < CONN_ATTEMPT_INTERVAL) {
+	    (t - sd->lastAttempt) <= CONN_ATTEMPT_INTERVAL) {
 		return -1;
 	}

@@ -462,7 +462,7 @@ static int myShout_openShoutConn(AudioOutput * audioOutput)

 	state = shout_open(sd->shoutConn);

-	while (state == SHOUTERR_BUSY && (t - sd->lastAttempt) < sd->timeout) {
+	while (state == SHOUTERR_BUSY && (t - sd->lastAttempt) <= sd->timeout) {
 		my_usleep(10000);
 		state = shout_get_connected(sd->shoutConn);
 		t = time(NULL);