oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

command: never print "bad name" in response to "load"

Browse Source 
Work around a confusing error message.
This commit is contained in:
Max Kellermann 2012-02-13 19:51:27 +01:00
parent 5ee3a9a9ca
commit 3b6790c7dc
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/command.c
View File

@ -817,11 +817,20 @@ handle_load(struct client *client, int argc, char *argv[])
return print_playlist_result(client, result);
GError *error = NULL;
return playlist_load_spl(&g_playlist, client->player_control,
argv[1], start_index, end_index,
&error)
? COMMAND_RETURN_OK
: print_error(client, error);
if (playlist_load_spl(&g_playlist, client->player_control,
argv[1], start_index, end_index,
&error))
return COMMAND_RETURN_OK;
if (error->domain == playlist_quark() &&
error->code == PLAYLIST_RESULT_BAD_NAME)
/* the message for BAD_NAME is confusing when the
client wants to load a playlist file from the music
directory; patch the GError object to show "no such
playlist" instead */
error->code = PLAYLIST_RESULT_NO_SUCH_LIST;
return print_error(client, error);
}
static enum command_return