X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=7293285ef9687ee1c35fd46bfb735a73f6870ec0;hp=b93f29de4498c50f574e55c4c8b3e9a34dfe0aee;hb=2bad70d84e763b4d866d7b97dbc1cdc8e030bd45;hpb=f787a626b8885247948e3c47ae886b1e3a7c2a3a

diff --git a/audiod.c b/audiod.c
index b93f29de..7293285e 100644
--- a/audiod.c
+++ b/audiod.c
@@ -445,7 +445,8 @@ static void close_receiver(int slot_num)
 	task_reap(&s->receiver_node->task);
 	free(s->receiver_node);
 	s->receiver_node = NULL;
-	stat_task->current_audio_format_num = -1;
+	if (audiod_status == AUDIOD_ON)
+		stat_task->current_audio_format_num = -1;
 	tv_add(now, &(struct timeval)EMBRACE(0, 200 * 1000),
 		&a->restart_barrier);
 }
@@ -801,7 +802,7 @@ static int parse_stream_command(const char *txt, const char **cmd)
 		return -E_MISSING_COLON;
 	*cmd = p + 1;
 	len = p - txt;
-	re = malloc(len + 1);
+	re = para_malloc(len + 1);
 	strncpy(re, txt, len);
 	re[len] = '\0';
 	ret = get_matching_audio_format_nums(re);
@@ -1451,7 +1452,6 @@ int main(int argc, char *argv[])
 	parse_config_or_die();
 	crypt_init();
 	daemon_set_priority(OPT_UINT32_VAL(PRIORITY));
-	recv_init();
 	if (daemon_init_colors_or_die(OPT_UINT32_VAL(COLOR), COLOR_AUTO,
 			COLOR_NO, OPT_GIVEN(LOGFILE))) {
 		for (i = 0; i < OPT_GIVEN(LOG_COLOR); i++)