the record command now disconnects you if starting a new map, this fixes a crash...

[xonotic/darkplaces.git] / snd_sdl.c

diff --git a/snd_sdl.c b/snd_sdl.c
index acd2ba39bdae8c039f510eaaad345e644d03cbf8..b82a56a4737808ff9ffdcf439a933d94711fdac7 100644 (file)
--- a/snd_sdl.c
+++ b/snd_sdl.c
@@ -141,12 +141,17 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
        }
 
        snd_renderbuffer = Snd_CreateRingBuffer(requested, 0, NULL);
-
+       if (snd_channellayout.integer == SND_CHANNELLAYOUT_AUTO)
+       {
+               int newlayout;
+               
 #ifdef __linux__
-       alsaspeakerlayout = true;
+               newlayout = SND_CHANNELLAYOUT_ALSA;
 #else
-       alsaspeakerlayout = false;
+               newlayout = SND_CHANNELLAYOUT_STANDARD;
 #endif
+               Cvar_SetValueQuick (&snd_channellayout, newlayout);
+       }
 
        sdlaudiotime = 0;
        SDL_PauseAudio( false );