From 2404cdef804cd358dda0ee7accc76cd3eea04b87 Mon Sep 17 00:00:00 2001 From: ARembo Date: Mon, 25 Jul 2011 12:56:58 -0400 Subject: [PATCH] =?utf8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?= =?utf8?q?=D0=BD=20segfault=20=D0=BF=D1=80=D0=B8=20=D0=B7=D0=B0=D0=BA?= =?utf8?q?=D1=80=D1=8B=D1=82=D0=B8=D0=B8=20=D0=BE=D0=BA=D0=BD=D0=B0=20?= =?utf8?q?=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/music.c | 8 +++++--- src/sound.c | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/music.c b/src/music.c index 5e7308f..8f9c13e 100644 --- a/src/music.c +++ b/src/music.c @@ -64,9 +64,11 @@ void S_initmusic(void) void S_donemusic(void) { - F_freemus(); - Mix_CloseAudio(); - SDL_QuitSubSystem(SDL_INIT_AUDIO); + if (SDL_WasInit(SDL_INIT_AUDIO)) { + F_freemus(); + Mix_CloseAudio(); + SDL_QuitSubSystem(SDL_INIT_AUDIO); + } } void S_startmusic(int time) diff --git a/src/sound.c b/src/sound.c index ab92524..cee95a9 100644 --- a/src/sound.c +++ b/src/sound.c @@ -74,8 +74,10 @@ void S_init(void) void S_done(void) { free_chunks(); - Mix_CloseAudio(); - SDL_QuitSubSystem(SDL_INIT_AUDIO); + if (SDL_WasInit(SDL_INIT_AUDIO)) { + Mix_CloseAudio(); + SDL_QuitSubSystem(SDL_INIT_AUDIO); + } } Mix_Chunk * get_chunk(snd_t *s, int r, int v) -- 2.29.2