Mercurial > audlegacy
changeset 1690:bb1323938306 trunk
[svn] - fix for issue that was fixed in r1946 and then appeared again later :)
| author | giacomo |
|---|---|
| date | Thu, 14 Sep 2006 13:27:38 -0700 |
| parents | b59d6c3258fc |
| children | e24213152357 |
| files | ChangeLog audacious/playlist.c |
| diffstat | 2 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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; }