From 1054356cefefc2c0cb675d7ba06fec16fc905400 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sat, 8 Feb 2020 21:36:57 +0100
Subject: [PATCH] - fixed CD music playback in SW on maps with no MIDI defined.

---
 source/sw/src/sounds.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/source/sw/src/sounds.cpp b/source/sw/src/sounds.cpp
index 1f715314b..1747a077a 100644
--- a/source/sw/src/sounds.cpp
+++ b/source/sw/src/sounds.cpp
@@ -924,19 +924,15 @@ extern short Level;
 
 SWBOOL PlaySong(const char* mapname, const char* song_file_name, int cdaudio_track, bool isThemeTrack) //(nullptr, nullptr, -1, false) starts the normal level music.
 {
-    if (mapname == nullptr && song_file_name == nullptr && cdaudio_track == -1)
-    {
-        // Get the music defined for the current level.
-
-    }
     // Play  CD audio if enabled.
-    if (cdaudio_track >= 0 && mus_redbook)
+    if (cdaudio_track >= 0 && (mus_redbook || *song_file_name == 0))
     {
         FStringf trackname("track%02d.ogg", cdaudio_track);
         if (!Mus_Play(mapname, trackname, true))
         {
             buildprintf("Can't find CD track %i!\n", cdaudio_track);
         }
+        else return true;
     }
     if (!Mus_Play(mapname, song_file_name, true))
     {