Skip to content

M
mpd
Commit cb9965ba authored by Anton Khirnov's avatar Anton Khirnov Committed by Max Kellermann
Browse files
Options

command: don't error when sticker list is run on song with no stickers

this is inconsistent with other commands (e.g. find) and seems wrong -- a song with no stickers attached is a perfectly valid state and an empty list of stickers is also perfectly valid.
parent 429ed24c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
src/command.c
View file @ cb9965ba
...@@ -1715,15 +1715,11 @@ handle_sticker_song(struct client *client, int argc, char *argv[]) ...@@ -1715,15 +1715,11 @@ handle_sticker_song(struct client *client, int argc, char *argv[])
} }
sticker = sticker_song_get(song); sticker = sticker_song_get(song);
if (NULL == sticker) { if (sticker) {
command_error(client, ACK_ERROR_NO_EXIST, sticker_print(client, sticker);
"no stickers found"); sticker_free(sticker);
return COMMAND_RETURN_ERROR;
} }
sticker_print(client, sticker);
sticker_free(sticker);
return COMMAND_RETURN_OK; return COMMAND_RETURN_OK;
/* set song song_id id key */ /* set song song_id id key */
} else if (argc == 6 && strcmp(argv[1], "set") == 0) { } else if (argc == 6 && strcmp(argv[1], "set") == 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment