# HG changeset patch
# User nenolod
# Date 1162204354 28800
# Node ID 30d40252862dd5ebd667cccd29c62c15b1583b6d
# Parent  21706518e13049acdb575e839122c943cdbd106f
[svn] - this should fix #592. somebody please check.

diff -r 21706518e130 -r 30d40252862d ChangeLog
--- a/ChangeLog	Mon Oct 30 01:39:13 2006 -0800
+++ b/ChangeLog	Mon Oct 30 02:32:34 2006 -0800
@@ -1,3 +1,15 @@
+2006-10-30 09:39:13 +0000  Kiyoshi Aman <kiyoshi.aman@gmail.com>
+  revision [2781]
+  Add Ivory to skins. [Ivory is an inverse version of the Osmosis skin.]
+  
+  trunk/skins/Ivory/Makefile     |   24 +++++++++++++++
+  trunk/skins/Ivory/pledit.txt   |    6 +++
+  trunk/skins/Ivory/skin.hints   |   64 +++++++++++++++++++++++++++++++++++++++++
+  trunk/skins/Ivory/viscolor.txt |   24 +++++++++++++++
+  trunk/skins/Makefile           |    2 -
+  5 files changed, 119 insertions(+), 1 deletion(-)
+
+
 2006-10-30 08:47:31 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2779]
   - add a Classic variant which looks like the oldschool audacious skin (< 1.2.x)
diff -r 21706518e130 -r 30d40252862d audacious/playback.c
--- a/audacious/playback.c	Mon Oct 30 01:39:13 2006 -0800
+++ b/audacious/playback.c	Mon Oct 30 02:32:34 2006 -0800
@@ -81,7 +81,7 @@
 void
 bmp_playback_initiate(void)
 {
-    PlaylistEntry *entry;
+    PlaylistEntry *entry = NULL;
 
     if (playlist_get_length() == 0)
         return;
@@ -98,8 +98,21 @@
     if (!entry)
         return;
 
-    if (!bmp_playback_play_file(entry))
-        return;
+    /*
+     * If the playlist entry cannot be played, try to pick another one.
+     * If that does not work, e.g. entry == NULL, then bail.
+     *
+     *   - nenolod
+     */
+    while (entry != NULL && !bmp_playback_play_file(entry))
+    {
+        playlist_next();
+
+        entry = playlist_get_entry_to_play();
+
+        if (entry == NULL)
+            return;
+    }
 
     if (bmp_playback_get_time() != -1) {
         equalizerwin_load_auto_preset(entry->filename);