X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cd_linux.c;h=bdfea6068879c8c2956f0ca3297ed26c8c15cbde;hp=5a37ff2075f2bf778320a10b1b50fbc82afd31ec;hb=b47b74389ee3f609d12f738f6038842fbd0d409a;hpb=f5afc1b5ce9ca37fbbfa7f9e1f91b6a8ca9f414e

diff --git a/cd_linux.c b/cd_linux.c
index 5a37ff20..bdfea606 100644
--- a/cd_linux.c
+++ b/cd_linux.c
@@ -35,6 +35,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
+// used by menu to ghost CD audio slider
+qboolean cdaudioinitialized = false;
 static qboolean cdValid = false;
 static qboolean	playing = false;
 static qboolean	wasPlaying = false;
@@ -202,7 +204,7 @@ void CDAudio_Resume(void)
 	if (!wasPlaying)
 		return;
 	
-	if ( ioctl(cdfile, CDROMRESUME) == -1 ) 
+	if ( ioctl(cdfile, CDROMRESUME) == -1 )
 		Con_DPrintf("ioctl cdromresume failed\n");
 	playing = true;
 }
@@ -337,13 +339,13 @@ void CDAudio_Update(void)
 	{
 		if (cdvolume)
 		{
-			Cvar_SetValue ("bgmvolume", 0.0);
+			Cvar_SetValueQuick (&bgmvolume, 0.0);
 			cdvolume = bgmvolume.value;
 			CDAudio_Pause ();
 		}
 		else
 		{
-			Cvar_SetValue ("bgmvolume", 1.0);
+			Cvar_SetValueQuick (&bgmvolume, 1.0);
 			cdvolume = bgmvolume.value;
 			CDAudio_Resume ();
 		}
@@ -389,6 +391,7 @@ int CDAudio_Init(void)
 
 	for (i = 0; i < 100; i++)
 		remap[i] = i;
+	cdaudioinitialized = true;
 	initialized = true;
 	enabled = true;