diff options
author | Simon Howard | 2014-05-01 01:54:23 -0400 |
---|---|---|
committer | Simon Howard | 2014-05-01 01:54:23 -0400 |
commit | ca2a6aee59f8bf0960cca15e8f8d681f92bb1f11 (patch) | |
tree | 7f65cdd461ffc29bb200e19d8f4f304f198e27b8 | |
parent | f1a5a3b9998128d855706dbf8a1a41c9175b43f3 (diff) | |
download | chocolate-doom-ca2a6aee59f8bf0960cca15e8f8d681f92bb1f11.tar.gz chocolate-doom-ca2a6aee59f8bf0960cca15e8f8d681f92bb1f11.tar.bz2 chocolate-doom-ca2a6aee59f8bf0960cca15e8f8d681f92bb1f11.zip |
opl: Fix crash when using OPL music.
The previous change to add the poll method to the music module
interface introduced a crash, as the OPL music struct does not
define a poll method.
-rw-r--r-- | src/i_oplmusic.c | 1 | ||||
-rw-r--r-- | src/i_sound.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/i_oplmusic.c b/src/i_oplmusic.c index 142e401a..678b275f 100644 --- a/src/i_oplmusic.c +++ b/src/i_oplmusic.c @@ -1479,6 +1479,7 @@ music_module_t music_opl_module = I_OPL_PlaySong, I_OPL_StopSong, I_OPL_MusicIsPlaying, + NULL, // Poll }; //---------------------------------------------------------------------- diff --git a/src/i_sound.c b/src/i_sound.c index 1b61f06f..f107de69 100644 --- a/src/i_sound.c +++ b/src/i_sound.c @@ -279,7 +279,7 @@ void I_UpdateSound(void) sound_module->Update(); } - if (music_module != NULL) + if (music_module != NULL && music_module->Poll != NULL) { music_module->Poll(); } |