From cb9965bab521cf9bbd2655162500e06ee6f60008 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 27 Nov 2010 20:36:11 +0100 Subject: [PATCH] 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. --- src/command.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/command.c b/src/command.c index df0146c16..781547b44 100644 --- a/src/command.c +++ b/src/command.c @@ -1715,15 +1715,11 @@ handle_sticker_song(struct client *client, int argc, char *argv[]) } sticker = sticker_song_get(song); - if (NULL == sticker) { - command_error(client, ACK_ERROR_NO_EXIST, - "no stickers found"); - return COMMAND_RETURN_ERROR; + if (sticker) { + sticker_print(client, sticker); + sticker_free(sticker); } - sticker_print(client, sticker); - sticker_free(sticker); - return COMMAND_RETURN_OK; /* set song song_id id key */ } else if (argc == 6 && strcmp(argv[1], "set") == 0) {