bad shank, don't set ao->open in openShoutConn(), bad shank

this should fix a few bugs, possibly the memory leak git-svn-id: https://svn.musicpd.org/mpd/trunk@2442 09075e82-0dd4-0310-85a5-a0d7c8717e4f

bad shank, don't set ao->open in openShoutConn(), bad shank
8cb14776 · Warren Dukes · fab2bef8 · 8cb14776
Commit 8cb14776 authored Nov 01, 2004 by Warren Dukes
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

audioOutput_shout.c src/audioOutput_shout.c +6 -3

No files found.
--- a/src/audioOutput_shout.c
+++ b/src/audioOutput_shout.c
@@ -364,13 +364,11 @@ static int shout_openShoutConn(AudioOutput * audioOutput) {
 		ERROR("problem opening connection to shout server: %s\n",
 				shout_get_error(sd->shoutConn));

-		audioOutput->open = 0;
 		return -1;
 	}

 	if(initEncoder(sd) < 0) {
 		shout_close(sd->shoutConn);
-		audioOutput->open = 0;
 		return -1;
 	}

@@ -414,7 +412,12 @@ static int shout_openDevice(AudioOutput * audioOutput,

 	if(sd->opened) return 0;

-	return shout_openShoutConn(audioOutput);
+	if(shout_openShoutConn(audioOutput) < 0) {
+		audioOutput->open = 1;
+		return -1;
+	}
+
+	return 0;
 }

 static void shout_convertAudioFormat(ShoutData * sd, char ** chunkArgPtr,