- fixed: Loading a savegame with music switched off forced a restart of the map's default music

because starting an empty music was considered an error.


SVN r2272 (trunk)

src/s_playlist.cpp

@@ -122,8 +122,13 @@ bool FPlayList::ChangeList (const char *path)
 			// Path is relative; append it to the playlist directory.
 			song = playlistdir + song;
 		}
+
+		// Just to make sure
+		if (song.IsNotEmpty())
+		{
 			Songs.Push(song);
 		}
+	}
 	fclose (file);
 
 	return Songs.Size() != 0;

src/s_sound.cpp

@@ -2327,7 +2327,7 @@ bool S_ChangeMusic (const char *musicname, int order, bool looping, bool force)
 		// Don't choke if the map doesn't have a song attached
 		S_StopMusic (true);
 		mus_playing.name = "";
-		return false;
+		return true;
 	}
 
 	FString DEH_Music;