From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 30 Jan 2010 21:56:54 +0000 (+0000)
Subject: don't call StartPlaylist if index is -1 (disables playlists)
X-Git-Tag: xonotic-v0.1.0preview~753
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b35df70f9a65547f73175fd63b4c6c6831cdc9cc;p=xonotic%2Fdarkplaces.git

don't call StartPlaylist if index is -1 (disables playlists)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9893 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=fe8d421f80631d495c60a17533642992986c1b5b
---

diff --git a/cd_shared.c b/cd_shared.c
index 06589a09..e7e39530 100644
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -706,7 +706,7 @@ void CDAudio_Update (void)
 		lastplaylist = music_playlist_index.integer;
 	}
 	else if (lastplaylist != music_playlist_index.integer
-	|| (bgmvolume.value > 0 && !music_playlist_playing))
+	|| (bgmvolume.value > 0 && !music_playlist_playing && music_playlist_index.integer >= 0))
 	{
 		// active playlist changed, save position and switch track
 		CDAudio_StartPlaylist(true);