X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=vss.c;h=e470a737d4c9224bf06336c02f02c77ff1c8fa24;hb=0b5f380ddc094b9dc3741dc2beaf7b775e4946d6;hp=3c566227f0925006a0501ec0ec2e8e5d48dd21bc;hpb=9207a81bf1bb5b6bd4db7e2640994e0cfc5f9a3f;p=paraslash.git

diff --git a/vss.c b/vss.c
index 3c566227..e470a737 100644
--- a/vss.c
+++ b/vss.c
@@ -184,6 +184,8 @@ static void vss_eof(void)
 			senders[i].shutdown_clients();
 		return;
 	}
+	if (mmd->new_vss_status_flags & VSS_NOMORE)
+		mmd->new_vss_status_flags = VSS_NEXT;
 	gettimeofday(&now, NULL);
 	tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
 	munmap(map, mmd->size);
@@ -194,9 +196,10 @@ static void vss_eof(void)
 	free(mmd->afd.afhi.chunk_table);
 	mmd->afd.afhi.chunk_table = NULL;
 	tmp  = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_FILE_INFO],
-		status_item_list[SI_TAG_INFO1], status_item_list[SI_TAG_INFO2]);
+		status_item_list[SI_TAGINFO1], status_item_list[SI_TAGINFO2]);
 	strncpy(mmd->afd.afhi.info_string, tmp, sizeof(mmd->afd.afhi.info_string));
 	mmd->afd.afhi.info_string[sizeof(mmd->afd.afhi.info_string) - 1] = '\0';
+	make_empty_status_items(mmd->afd.verbose_ls_output);
 	free(tmp);
 	mmd->mtime = 0;
 	mmd->size = 0;
@@ -300,8 +303,6 @@ struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno)
 				tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
 			if (vss_repos())
 				tv_add(&now, &announce_tv, &data_send_barrier);
-			if (mmd->new_vss_status_flags & VSS_NOMORE)
-				mmd->new_vss_status_flags = VSS_NEXT;
 		}
 		mmd->chunks_sent = 0;
 	}