output/control: add missing nullptr checks
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:
parent
650a30d794
commit
b885f358a5
1
NEWS
1
NEWS
|
@ -9,6 +9,7 @@ ver 0.22.7 (not yet released)
|
|||
* database
|
||||
- simple: fix database corruption bug
|
||||
* output
|
||||
- fix crash when pausing with multiple partitions
|
||||
- httpd: send header "Access-Control-Allow-Origin: *"
|
||||
- wasapi: add algorithm for finding usable audio format
|
||||
- wasapi: use default device only if none was configured
|
||||
|
|
|
@ -118,7 +118,7 @@ AudioOutputControl::GetLogName() const noexcept
|
|||
{
|
||||
assert(!IsDummy());
|
||||
|
||||
return output->GetLogName();
|
||||
return output ? output->GetLogName() : name.c_str();
|
||||
}
|
||||
|
||||
Mixer *
|
||||
|
@ -364,7 +364,7 @@ AudioOutputControl::LockPlay() noexcept
|
|||
void
|
||||
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,
|
||||
unless its "global" flag is set (checked by
|
||||
mixer_auto_close()) */
|
||||
|
|
Loading…
Reference in New Issue