Mercurial > audlegacy

changeset 1165:6fe822f5a3c0 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - make it work for real
author nenolod
date Sat, 10 Jun 2006 21:44:36 -0700
parents ea95c89c92ee
children 36e8431d8e19
files audacious/playlist.c
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/audacious/playlist.c	Sat Jun 10 21:29:02 2006 -0700
+++ b/audacious/playlist.c	Sat Jun 10 21:44:36 2006 -0700
@@ -508,12 +508,12 @@
         return TRUE;
     }
 
-    if (loading_playlist == TRUE || cfg.playlist_detect == FALSE)
+    if (loading_playlist == TRUE || cfg.playlist_detect == TRUE)
 	dec = NULL;
     else
 	dec = input_check_file(filename, TRUE);
 
-    if (cfg.playlist_detect == FALSE || loading_playlist == TRUE || (loading_playlist == FALSE && dec != NULL))
+    if (cfg.playlist_detect == TRUE || loading_playlist == TRUE || (loading_playlist == FALSE && dec != NULL))
     {
 	__playlist_ins(filename, pos, dec);
 	playlist_generate_shuffle_list();
@@ -660,6 +660,8 @@
             g_free(filename);
             list = g_list_concat(list, sub);
         }
+        else if (cfg.playlist_detect == TRUE)
+            list = g_list_prepend(list, filename);
         else if (input_check_file(filename, TRUE))
             list = g_list_prepend(list, filename);
         else
@@ -1385,7 +1387,7 @@
         }
         tmp = g_build_filename(path, filename, NULL);
 
-	if (loading_playlist != TRUE || cfg.playlist_detect == FALSE)
+	if (loading_playlist != TRUE && cfg.playlist_detect != TRUE)
 	    dec = input_check_file(tmp, FALSE);
 	else
 	    dec = NULL;
@@ -1396,7 +1398,7 @@
     }
     else
     {
-	if (loading_playlist != TRUE || cfg.playlist_detect == FALSE)
+	if (loading_playlist != TRUE && cfg.playlist_detect != TRUE)
 	    dec = input_check_file(filename, FALSE);
 	else
 	    dec = NULL;