From cc24a339d8c0517259084b5c178d784626ba965c Mon Sep 17 00:00:00 2001 From: ImJezze Date: Sun, 21 Feb 2016 11:48:45 +0100 Subject: Merge remote-tracking branch 'refs/remotes/mamedev/master' Second attempt --- src/emu/disound.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/emu/disound.cpp') diff --git a/src/emu/disound.cpp b/src/emu/disound.cpp index c1f4e49f4b6..7134b588963 100644 --- a/src/emu/disound.cpp +++ b/src/emu/disound.cpp @@ -443,7 +443,10 @@ void device_mixer_interface::interface_pre_start() void device_mixer_interface::interface_post_load() { - m_mixer_stream->set_sample_rate(device().machine().sample_rate()); + // Beware that there's not going to be a mixer stream if there was + // no inputs + if (m_mixer_stream) + m_mixer_stream->set_sample_rate(device().machine().sample_rate()); // call our parent device_sound_interface::interface_post_load(); -- cgit v1.2.3-70-g09d2