Merge commit 'release-0.16.2'

Conflicts:
	Makefile.am
	NEWS
	configure.ac
This commit is contained in:
Max Kellermann
2011-03-19 09:58:07 +01:00
24 changed files with 128 additions and 43 deletions

View File

@@ -763,7 +763,7 @@ handle_load(struct client *client, G_GNUC_UNUSED int argc, char *argv[])
result = playlist_open_into_queue(argv[1], &g_playlist,
client->player_control, true);
if (result != PLAYLIST_RESULT_NO_SUCH_LIST)
return result;
return print_playlist_result(client, result);
result = playlist_load_spl(&g_playlist, client->player_control,
argv[1]);