foxygit / doom Log in
commit 8ccb6eaf454574e3117fffc79c7ab51478c29d25
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Wed Oct 16 00:41:48 2013 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Wed Oct 16 00:41:48 2013 +0000

    Fix bug with freeing of static strings, accidentally introduced in
    r2633.

    Subversion-branch: /branches/v2-branch
    Subversion-revision: 2712
---
 src/setup/sound.c | 7 +++++--
 1 file 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.