# HG changeset patch
# User Jonathan Schleifer <js@h3c.de>
# Date 1189846463 -7200
# Node ID 7532ab3d25e57e4308cfc9bba30fea9eff7a403b
# Parent  18391c12c18c6068cab5932d38d5aebbcee76eb8# Parent  08dae20c75f01d95a283db9a7a07f85ccb0aaacd
Automated merge with ssh://hg.atheme-project.org//hg/audacious

diff -r 18391c12c18c -r 7532ab3d25e5 src/audacious/main.c
--- a/src/audacious/main.c	Sat Sep 15 10:54:08 2007 +0200
+++ b/src/audacious/main.c	Sat Sep 15 10:54:23 2007 +0200
@@ -938,6 +938,7 @@
 
     /* Save extra playlists that were loaded from PLAYLISTS_DIR  */
     saved = NULL;
+    saved = g_list_prepend(saved, playlist); /* don't save default again */
     if(!dir_foreach(bmp_paths[BMP_PATH_PLAYLISTS_DIR], save_extra_playlist,
             &saved, NULL)) {
         g_warning("Could not save extra playlists\n");
@@ -1299,12 +1300,6 @@
 
     title = playlist_get_current_name(playlist);
 
-    if (playlist_playlists_equal(playlist, deflist)) {
-        /* same as default playlist */
-        playlist_remove_playlist(playlist);
-        playlist_filename_set(deflist, path);
-    }
-
     return FALSE; /* keep loading other playlists */
 }