X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afs.c;h=445d5871097b79cdcd14170c2a1f59998354dc98;hb=101dcb49997b393280c10ba5a1cfc11e8fe0a091;hp=3083084c25ac793cfd3a5cad1f93c6e78f0fa413;hpb=4345aa176aecdbd9a876e7efdcc034acd29616a7;p=paraslash.git

diff --git a/afs.c b/afs.c
index 3083084c..445d5871 100644
--- a/afs.c
+++ b/afs.c
@@ -970,29 +970,32 @@ static int com_select_callback(struct afs_callback_arg *aca)
 	const struct lls_command *cmd = SERVER_CMD_CMD_PTR(SELECT);
 	const char *arg;
 	int ret;
+	struct para_buffer *pbout;
 
 	ret = lls_deserialize_parse_result(aca->query.data, cmd, &aca->lpr);
 	assert(ret >= 0);
 	arg = lls_input(0, aca->lpr);
+	pbout = SERVER_CMD_OPT_GIVEN(SELECT, VERBOSE, aca->lpr)?
+		&aca->pbout : NULL;
 	score_clear();
 	if (current_play_mode == PLAY_MODE_MOOD)
 		mood_unload(NULL);
 	else
 		playlist_unload(NULL);
-	ret = activate_mood_or_playlist(arg, &aca->pbout);
+	ret = activate_mood_or_playlist(arg, pbout);
 	if (ret >= 0)
 		goto free_lpr;
 	/* ignore subsequent errors (but log them) */
 	if (current_mop && strcmp(current_mop, arg) != 0) {
 		int ret2;
 		afs_error(aca, "switching back to %s\n", current_mop);
-		ret2 = activate_mood_or_playlist(current_mop, &aca->pbout);
+		ret2 = activate_mood_or_playlist(current_mop, pbout);
 		if (ret2 >= 0)
 			goto free_lpr;
 		afs_error(aca, "could not reactivate %s: %s\n", current_mop,
 			para_strerror(-ret2));
 	}
-	activate_mood_or_playlist(NULL, &aca->pbout);
+	activate_mood_or_playlist(NULL, pbout);
 free_lpr:
 	lls_free_parse_result(aca->lpr, cmd);
 	return ret;