From 8534b9705ba49ee135a13aba95a6dcf5953ea6e9 Mon Sep 17 00:00:00 2001 From: zico Date: Thu, 27 Jun 2013 11:41:46 +0200 Subject: [PATCH] fixed regression introduced in bb57521ef1 causing the game to crash when trying to incorrectly re-init SDL_mixer for change in sample rate - which isn't needed in the first place --- main/piggy.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/main/piggy.c b/main/piggy.c index eae27ccab..5526da175 100644 --- a/main/piggy.c +++ b/main/piggy.c @@ -765,8 +765,13 @@ int read_hamfile() { shareware = 1; GameArg.SndDigiSampleRate = SAMPLE_RATE_11K; - digi_close(); - digi_init(); +#ifdef USE_SDLMIXER + if (GameArg.SndDisableSdlMixer) +#endif + { + digi_close(); + digi_init(); + } } }