From 62d546e25d22402904e9922b3a02e50c975a66f8 Mon Sep 17 00:00:00 2001
From: trz <trz>
Date: Fri, 23 Jun 2006 15:02:21 +0000
Subject: Part of fix for bug #2532

---
 runtime/stpd/librelay.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'runtime/stpd/librelay.c')

diff --git a/runtime/stpd/librelay.c b/runtime/stpd/librelay.c
index ae03c200..c3ad77ea 100644
--- a/runtime/stpd/librelay.c
+++ b/runtime/stpd/librelay.c
@@ -657,10 +657,12 @@ static void cleanup_and_exit (int closed)
 	if (print_totals && verbose)
 		summarize();
 
-	if (transport_mode == STP_TRANSPORT_RELAYFS && merge) {
+	if (transport_mode == STP_TRANSPORT_RELAYFS) {
 		close_all_relayfs_files();
-		merge_output();
-		delete_percpu_files();
+		if (merge) {
+			merge_output();
+			delete_percpu_files();
+		}
 	}
 
 	dbug("closing control channel\n");
-- 
cgit