From d6b25bf854c164021550dfa8ff9fb4cfb104582e Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 1 Sep 2019 10:20:37 +0200 Subject: [PATCH] mixer: fade: Handle empty mood strings gracefully. Treat them as if the option was not given to prevent "para_client select" to fail. --- mixer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mixer.c b/mixer.c index efa42b93..b14bb76e 100644 --- a/mixer.c +++ b/mixer.c @@ -288,7 +288,7 @@ static int com_sleep(const struct mixer *m, struct mixer_handle *h) PARA_INFO_LOG("waketime: %d:%02d\n", tm->tm_hour, tm->tm_min); client_cmd("stop"); sleep(1); - if (fot && fo_mood) { + if (fot && fo_mood && *fo_mood) { ret = set_initial_volume(m, h); if (ret < 0) return ret; @@ -305,13 +305,13 @@ static int com_sleep(const struct mixer *m, struct mixer_handle *h) if (ret < 0) return ret; } - if (sleep_mood) { + if (sleep_mood && *sleep_mood) { change_afs_mode(sleep_mood); if (!fot || !fo_mood) /* currently stopped */ client_cmd("play"); - } else if (fot && fo_mood) /* currently playing */ + } else if (fot && fo_mood && *fo_mood) /* currently playing */ client_cmd("stop"); - if (!fit || !fi_mood) /* nothing to do */ + if (!fit || !fi_mood || !*fi_mood) /* nothing to do */ return 1; for (;;) { time(&t1); @@ -324,7 +324,7 @@ static int com_sleep(const struct mixer *m, struct mixer_handle *h) sleep(delay); } change_afs_mode(fi_mood); - if (sleep_mood) /* currently playing */ + if (sleep_mood && *sleep_mood) /* currently playing */ client_cmd("next"); else /* currently stopped */ client_cmd("play"); -- 2.39.2