fix bug with rtlights on vertex texture blend surfaces (such as in

[xonotic/darkplaces.git] / cd_shared.c

diff --git a/cd_shared.c b/cd_shared.c
index 3bda8928091709306691dce08f86b341c6c1e815..0f5a3ade8f1af29eb669fdd5602bae59946d092d 100644 (file)
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -157,9 +157,9 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping)
                                S_SetChannelFlag (faketrack, CHANNELFLAG_FORCELOOP, true);
                        S_SetChannelFlag (faketrack, CHANNELFLAG_FULLVOLUME, true);
                        if(track >= 1)
-                               Con_DPrintf ("Fake CD track %u playing...\n", track);
+                               Con_Printf ("Fake CD track %u playing...\n", track);
                        else
-                               Con_DPrintf ("BGM track %s playing...\n", trackname);
+                               Con_Printf ("BGM track %s playing...\n", trackname);
                }
        }
 
@@ -171,7 +171,7 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping)
                        Con_Print("Could not load BGM track.\n");
                        return;
                }
-       
+
                if (!cdValid)
                {
                        CDAudio_GetAudioDiskInfo();
@@ -214,10 +214,10 @@ void CDAudio_Stop (void)
 
        if (faketrack != -1)
        {
-               S_StopChannel (faketrack);
+               S_StopChannel (faketrack, true);
                faketrack = -1;
        }
-       else if (CDAudio_SysStop() == -1)
+       else if (cdPlaying && (CDAudio_SysStop() == -1))
                return;
 
        wasPlaying = false;