From 0a8358243ba52074449e4007776426a6fda4bb73 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Sat, 21 Sep 2019 22:28:33 +0100
Subject: [PATCH] mosquitto_sub: Fix `-E` not working unless `-d` was also
 specified.

Closes #1418. Thanks to Lichard Torman.
---
 ChangeLog.txt       |  4 ++++
 client/sub_client.c | 12 +++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index abf74289..1bb417d7 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,7 @@
+Clients:
+- mosquitto_sub: Fix `-E` incorrectly not working unless `-d` was also
+  specified. Closes #1418.
+
 1.6.6 - 20190917
 ================
 
diff --git a/client/sub_client.c b/client/sub_client.c
index 68b0e790..faa68ebd 100644
--- a/client/sub_client.c
+++ b/client/sub_client.c
@@ -145,11 +145,13 @@ void my_subscribe_callback(struct mosquitto *mosq, void *obj, int mid, int qos_c
 
 	UNUSED(obj);
 
-	if(!cfg.quiet) printf("Subscribed (mid: %d): %d", mid, granted_qos[0]);
-	for(i=1; i<qos_count; i++){
-		if(!cfg.quiet) printf(", %d", granted_qos[i]);
+	if(cfg.debug){
+		if(!cfg.quiet) printf("Subscribed (mid: %d): %d", mid, granted_qos[0]);
+		for(i=1; i<qos_count; i++){
+			if(!cfg.quiet) printf(", %d", granted_qos[i]);
+		}
+		if(!cfg.quiet) printf("\n");
 	}
-	if(!cfg.quiet) printf("\n");
 
 	if(cfg.exit_after_sub){
 		mosquitto_disconnect_v5(mosq, 0, cfg.disconnect_props);
@@ -322,8 +324,8 @@ int main(int argc, char *argv[])
 	}
 	if(cfg.debug){
 		mosquitto_log_callback_set(mosq, my_log_callback);
-		mosquitto_subscribe_callback_set(mosq, my_subscribe_callback);
 	}
+	mosquitto_subscribe_callback_set(mosq, my_subscribe_callback);
 	mosquitto_connect_v5_callback_set(mosq, my_connect_callback);
 	mosquitto_message_v5_callback_set(mosq, my_message_callback);