From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sat, 5 Mar 2022 20:03:15 +0000 (+0100)
Subject: mixer: sleep: Always set initial volume and channel.
X-Git-Tag: v0.7.2~16^2~3
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=4108dd98ea72b0a603e55f39b39a4b49e2cbb40e;p=paraslash.git

mixer: sleep: Always set initial volume and channel.

It does not hurt to do this unconditionally, and it simplifies
subsequent work.
---

diff --git a/mixer.c b/mixer.c
index eae89291..42651d6a 100644
--- a/mixer.c
+++ b/mixer.c
@@ -318,15 +318,19 @@ static int com_sleep(const struct mixer *m)
 	PARA_INFO_LOG("waketime: %d:%02d\n", tm->tm_hour, tm->tm_min);
 	client_cmd("stop");
 	sleep(1);
+	ret = set_initial_volume(m, h);
+	if (ret < 0)
+		goto close_mixer;
+	/*
+	 * Setting the volume invalidates the current channel setting, so we
+	 * have to set it again.
+	 */
+	ret = set_channel(m, h, OPT_STRING_VAL(PARA_MIXER, MIXER_CHANNEL));
+	if (ret < 0)
+		goto close_mixer;
 	if (fot && fo_mood && *fo_mood) {
-		ret = set_initial_volume(m, h);
-		if (ret < 0)
-			goto close_mixer;
 		change_afs_mode(fo_mood);
 		client_cmd("play");
-		ret = set_channel(m, h, OPT_STRING_VAL(PARA_MIXER, MIXER_CHANNEL));
-		if (ret < 0)
-			goto close_mixer;
 		ret = fade(m, h, fov, fot);
 		if (ret < 0)
 			goto close_mixer;