From 75414c3bcd40537b4ee8b93db2fad8cf710aa7dc Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Sun, 16 Oct 2011 19:53:02 +0000
Subject: [PATCH] (svn r23033) -Fix [FS#4776]: the last custom playlist items
 went lost when the files in the .obm are not contiguous

---
 src/music_gui.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/music_gui.cpp b/src/music_gui.cpp
index ec2999c952..94e3f191bc 100644
--- a/src/music_gui.cpp
+++ b/src/music_gui.cpp
@@ -84,7 +84,8 @@ static byte * const _playlists[] = {
 void ValidatePlaylist(byte *playlist)
 {
 	while (*playlist != 0) {
-		if (*playlist <= BaseMusic::GetUsedSet()->num_available) {
+		/* Song indices are saved off-by-one so 0 is "nothing". */
+		if (*playlist <= NUM_SONGS_AVAILABLE && !StrEmpty(GetSongName(*playlist - 1))) {
 			playlist++;
 			continue;
 		}