From bba588752f8085da13edcacd71101055bd617303 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 21 Apr 2017 14:01:19 +0000
Subject: Store state shared between multiple commands in the queue in a shared
 structure.

---
 format.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'format.c')

diff --git a/format.c b/format.c
index b173df4c..4f5d4b9c 100644
--- a/format.c
+++ b/format.c
@@ -554,10 +554,12 @@ format_create(struct cmdq_item *item, int tag, int flags)
 	format_add(ft, "socket_path", "%s", socket_path);
 	format_add_tv(ft, "start_time", &start_time);
 
-	if (item != NULL && item->cmd != NULL)
-		format_add(ft, "command", "%s", item->cmd->entry->name);
-	if (item != NULL && item->formats != NULL)
-		format_merge(ft, item->formats);
+	if (item != NULL) {
+		if (item->cmd != NULL)
+			format_add(ft, "command", "%s", item->cmd->entry->name);
+		if (item->shared != NULL && item->shared->formats != NULL)
+			format_merge(ft, item->shared->formats);
+	}
 
 	return (ft);
 }
-- 
cgit