jack: initialize jd->client after !jd check

Prepare the next patch: make the "!jd" check independent of the jd->client initialization. This way we can change the "jd" initialization semantics later.

jack: initialize jd->client after !jd check
dc989987 · Max Kellermann · 23832311 · dc989987
Commit dc989987 authored Aug 26, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

audioOutput_jack.c src/audioOutputs/audioOutput_jack.c +5 -5

No files found.
--- a/src/audioOutputs/audioOutput_jack.c
+++ b/src/audioOutputs/audioOutput_jack.c
@@ -337,12 +337,12 @@ static int jack_openDevice(AudioOutput *audioOutput)
 		DEBUG("connect!\n");
 		jd = newJackData();
 		audioOutput->data = jd;
+	}

-		if (connect_jack(audioOutput) < 0) {
-			freeJackData(audioOutput);
-			audioOutput->open = 0;
-			return -1;
-		}
+	if (jd->client == NULL && connect_jack(audioOutput) < 0) {
+		freeJackData(audioOutput);
+		audioOutput->open = 0;
+		return -1;
 	}

 	set_audioformat(audioOutput);