don't call quitDecode() in waitOnDecode()

To make the code more consistent, call quitDecode() only at the end of decodeParent().

don't call quitDecode() in waitOnDecode()
a68ef497 · Max Kellermann · e8bd9ddc · a68ef497
Commit a68ef497 authored Aug 26, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

player_thread.c src/player_thread.c +3 -2

No files found.
--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -71,7 +71,6 @@ static int waitOnDecode(int *decodeWaitedOn)
 	if (dc.error != DECODE_ERROR_NOERROR) {
 		pc.errored_song = dc.next_song;
 		pc.error = PLAYER_ERROR_FILE;
-		quitDecode();
 		return -1;
 	}

@@ -211,8 +210,10 @@ static void decodeParent(void)

 	ob_set_lazy(0);

-	if (waitOnDecode(&decodeWaitedOn) < 0)
+	if (waitOnDecode(&decodeWaitedOn) < 0) {
+		quitDecode();
 		return;
+	}

 	pc.elapsedTime = 0;
 	pc.state = PLAYER_STATE_PLAY;