# HG changeset patch
# User giacomo
# Date 1158265658 25200
# Node ID bb132393830651f8347964ea95b9e260a419f0c9
# Parent  b59d6c3258fc84880a83d087fd0959e7842cbe3e
[svn] - fix for issue that was fixed in r1946 and then appeared again later :)

diff -r b59d6c3258fc -r bb1323938306 ChangeLog
--- a/ChangeLog	Thu Sep 14 08:46:01 2006 -0700
+++ b/ChangeLog	Thu Sep 14 13:27:38 2006 -0700
@@ -1,3 +1,13 @@
+2006-09-14 15:46:01 +0000  Jonathan Schleifer <js@h3c.de>
+  revision [2315]
+  Install audacious_player.xpm as well, so one can use it as a desktop icon.
+  Requested by Jan Schummers <darkadmiral@onlinehome.de>.
+  
+
+  Changes:        Modified:
+  +1 -0           trunk/audacious/images/Makefile.in  
+
+
 2006-09-14 14:50:44 +0000  Jonathan Schleifer <js@h3c.de>
   revision [2313]
   Made the content of the password field in the AudioScrobbler plugin invisible.
diff -r b59d6c3258fc -r bb1323938306 audacious/playlist.c
--- a/audacious/playlist.c	Thu Sep 14 08:46:01 2006 -0700
+++ b/audacious/playlist.c	Thu Sep 14 13:27:38 2006 -0700
@@ -174,6 +174,9 @@
 
     g_return_val_if_fail(entry != NULL, FALSE);
 
+    if (entry->decoder == NULL)
+        entry->decoder = input_check_file(entry->filename, FALSE);
+
     /* renew tuple if file mtime is newer than tuple mtime. */
     if(entry->tuple){
         if(entry->tuple->mtime == modtime)
@@ -184,9 +187,6 @@
         }
     }
 
-    if (entry->decoder == NULL)
-        entry->decoder = input_check_file(entry->filename, FALSE);
-
     if (entry->decoder == NULL || entry->decoder->get_song_tuple == NULL)
         tuple = input_get_song_tuple(entry->filename);
     else
@@ -2117,7 +2117,7 @@
     if (playlist_get() && playlist_position)
     {
         path = g_strdup(playlist_position->filename);
-        if ( playlist_position->tuple == NULL )
+        if (( playlist_position->tuple == NULL ) || ( playlist_position->decoder == NULL ))
           playlist_entry_get_info(playlist_position);
         tuple = playlist_position->tuple;
     }