diff options
| author | Simon Howard | 2013-10-16 00:41:48 +0000 |
|---|---|---|
| committer | Simon Howard | 2013-10-16 00:41:48 +0000 |
| commit | 8ccb6eaf454574e3117fffc79c7ab51478c29d25 (patch) | |
| tree | 53eb1c950ffeb4c3560ddd9bec9e29678b14da08 /src/setup | |
| parent | a58243bec304aa8d735a2eeb81666201fc7c71fb (diff) | |
| download | chocolate-doom-8ccb6eaf454574e3117fffc79c7ab51478c29d25.tar.gz chocolate-doom-8ccb6eaf454574e3117fffc79c7ab51478c29d25.tar.bz2 chocolate-doom-8ccb6eaf454574e3117fffc79c7ab51478c29d25.zip | |
Fix bug with freeing of static strings, accidentally introduced in
r2633.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2712
Diffstat (limited to 'src/setup')
| -rw-r--r-- | src/setup/sound.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/setup/sound.c b/src/setup/sound.c index f601d5ff..dae07413 100644 --- a/src/setup/sound.c +++ b/src/setup/sound.c @@ -83,8 +83,8 @@ static int show_talk = 0; static int use_libsamplerate = 0; static float libsamplerate_scale = 0.65; -static char *timidity_cfg_path = ""; -static char *gus_patch_path = ""; +static char *timidity_cfg_path = NULL; +static char *gus_patch_path = NULL; static unsigned int gus_ram_kb = 1024; // DOS specific variables: these are unused but should be maintained @@ -327,6 +327,9 @@ void BindSoundVariables(void) M_BindVariable("show_talk", &show_talk); } + timidity_cfg_path = strdup(""); + gus_patch_path = strdup(""); + // Before SDL_mixer version 1.2.11, MIDI music caused the game // to crash when it looped. If this is an old SDL_mixer version, // disable MIDI. |