oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/control: add missing nullptr checks

Browse Source 
Fixes crash when pausing the default partition after an output was
moved to another partition.

Closes https://github.com/MusicPlayerDaemon/MPD/issues/1147
This commit is contained in:
Max Kellermann 2021-04-26 21:33:51 +02:00
parent 650a30d794
commit b885f358a5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -9,6 +9,7 @@ ver 0.22.7 (not yet released)
* database * database
- simple: fix database corruption bug - simple: fix database corruption bug
* output * output
- fix crash when pausing with multiple partitions
- httpd: send header "Access-Control-Allow-Origin: *" - httpd: send header "Access-Control-Allow-Origin: *"
- wasapi: add algorithm for finding usable audio format - wasapi: add algorithm for finding usable audio format
- wasapi: use default device only if none was configured - wasapi: use default device only if none was configured

4
src/output/Control.cxx
View File

@ -118,7 +118,7 @@ AudioOutputControl::GetLogName() const noexcept
{ {
assert(!IsDummy()); assert(!IsDummy());
return output->GetLogName(); return output ? output->GetLogName() : name.c_str();
} }
Mixer * Mixer *
@ -364,7 +364,7 @@ AudioOutputControl::LockPlay() noexcept
void void
AudioOutputControl::LockPauseAsync() noexcept AudioOutputControl::LockPauseAsync() noexcept
{ {
if (output->mixer != nullptr && !output->SupportsPause()) if (output && output->mixer != nullptr && !output->SupportsPause())
/* the device has no pause mode: close the mixer, /* the device has no pause mode: close the mixer,
unless its "global" flag is set (checked by unless its "global" flag is set (checked by
mixer_auto_close()) */ mixer_auto_close()) */