From aad1aa0dbd56e971416d9b83ec2458451a6b7ac2 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 10 Apr 2020 10:38:39 +0200
Subject: [PATCH] Fix grpflg regression

Fix grpflg regression (#8114)
---
 tasmota/support_command.ino | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index addac2c76..3df48484a 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -186,8 +186,10 @@ void CommandHandler(char* topicBuf, char* dataBuf, uint32_t data_len)
   uint32_t real_index = SET_MQTT_GRP_TOPIC;
   for (uint32_t i = 0; i < MAX_GROUP_TOPICS; i++) {
     if (1 == i) { real_index = SET_MQTT_GRP_TOPIC2 -1; }
-    grpflg = (strstr(topicBuf, SettingsText(real_index +i)) != nullptr);
-    if (grpflg) { break; }
+    if (strlen(SettingsText(real_index +i))) {
+      grpflg = (strstr(topicBuf, SettingsText(real_index +i)) != nullptr);
+      if (grpflg) { break; }
+    }
   }
 
   char stemp1[TOPSZ];