summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/disound.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-02-21 11:48:45 +0100
committer ImJezze <jezze@gmx.net>2016-02-21 11:48:45 +0100
commitcc24a339d8c0517259084b5c178d784626ba965c (patch)
tree9868e9687b5802ae0a3733712a3bbeb3bc75c953 /src/emu/disound.cpp
parentb5daabda5495dea5c50e17961ecfed2ea8619d76 (diff)
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Second attempt
Diffstat (limited to 'src/emu/disound.cpp')
-rw-r--r--src/emu/disound.cpp5
1 files changed, 4 insertions, 1 deletions
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();