playlist: log errors during loadPlaylist()

Don't call command_error() if loading a song from the playlist fails. This may result in assertion failures, since command_error() may be called more than once.

playlist: log errors during loadPlaylist()
8c5470a3 · Max Kellermann · 49ac6fa9 · 8c5470a3 · 8c5470a3 · 8c5470a3
Commit 8c5470a3 authored Jan 04, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

command.c src/command.c +1 -1

playlist.c src/playlist.c +2 -3

playlist.h src/playlist.h +1 -1

No files found.
--- a/src/command.c
+++ b/src/command.c
@@ -591,7 +591,7 @@ handle_load(struct client *client, G_GNUC_UNUSED int argc, char *argv[])
 {
 	enum playlist_result result;

-	result = loadPlaylist(client, argv[1]);
+	result = loadPlaylist(argv[1]);
 	return print_playlist_result(client, result);
 }


--- a/src/playlist.c
+++ b/src/playlist.c
@@ -1333,7 +1333,7 @@ int PlaylistInfo(struct client *client, const char *utf8file, int detail)
 	return 0;
 }

-enum playlist_result loadPlaylist(struct client *client, const char *utf8file)
+enum playlist_result loadPlaylist(const char *utf8file)
 {
 	GPtrArray *list;

@@ -1352,8 +1352,7 @@ enum playlist_result loadPlaylist(struct client *client, const char *utf8file)
 				p++;
 			}
 			if ((addToPlaylist(temp, NULL)) != PLAYLIST_RESULT_SUCCESS) {
-				command_error(client, ACK_ERROR_PLAYLIST_LOAD,
-					      "can't add file \"%s\"", temp2);
+				g_warning("can't add file \"%s\"", temp2);
 			}
 			free(temp2);
 		}

--- a/src/playlist.h
+++ b/src/playlist.h
@@ -126,7 +126,7 @@ enum playlist_result swapSongsInPlaylist(unsigned song1, unsigned song2);

 enum playlist_result swapSongsInPlaylistById(unsigned id1, unsigned id2);

-enum playlist_result loadPlaylist(struct client *client, const char *utf8file);
+enum playlist_result loadPlaylist(const char *utf8file);

 bool getPlaylistRepeatStatus(void);