aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2015-01-16 19:48:26 +0100
committerMax Kellermann <max@duempel.org>2015-01-16 19:48:26 +0100
commit4c74016b1aaf8a4cbcb15b5883626e98d4f420ab (patch)
treeb3fbc4f3ec55f9db1347e5d2db327c9319108cc3 /src
parent1d8544ef3b93d2a7b22e6bcbb47b19f2a0353eb1 (diff)
downloadmpd-4c74016b1aaf8a4cbcb15b5883626e98d4f420ab.tar.gz
mpd-4c74016b1aaf8a4cbcb15b5883626e98d4f420ab.tar.xz
mpd-4c74016b1aaf8a4cbcb15b5883626e98d4f420ab.zip
MixerAll: restore "null" mixer volume from state file
Diffstat (limited to 'src')
-rw-r--r--src/mixer/MixerAll.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mixer/MixerAll.cxx b/src/mixer/MixerAll.cxx
index cb035d0cc..f652a9a95 100644
--- a/src/mixer/MixerAll.cxx
+++ b/src/mixer/MixerAll.cxx
@@ -149,7 +149,8 @@ MultipleOutputs::SetSoftwareVolume(unsigned volume)
const auto mixer = ao->mixer;
if (mixer != nullptr &&
- &mixer->plugin == &software_mixer_plugin)
+ (&mixer->plugin == &software_mixer_plugin ||
+ &mixer->plugin == &null_mixer_plugin))
mixer_set_volume(mixer, volume, IgnoreError());
}
}