From fb56162c52a65fbfa82e227fefb1b187e4187327 Mon Sep 17 00:00:00 2001
From: Florian <1technophile@users.noreply.github.com>
Date: Tue, 15 Mar 2022 17:44:39 -0500
Subject: [PATCH] Remove servicedatauuid only when model is present (#1186)

keep it if we haven't decoded the message
---
 main/ZgatewayBT.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/ZgatewayBT.ino b/main/ZgatewayBT.ino
index f88c6175..f3c81421 100644
--- a/main/ZgatewayBT.ino
+++ b/main/ZgatewayBT.ino
@@ -914,7 +914,7 @@ void PublishDeviceData(JsonObject& BLEdata, bool processBLEData) {
     if (processBLEData) process_bledata(BLEdata);
     if (!publishOnlySensors || BLEdata.containsKey("model") || BLEdata.containsKey("distance")) {
 #  if !pubBLEServiceUUID
-      RemoveJsonPropertyIf(BLEdata, "servicedatauuid", BLEdata.containsKey("servicedatauuid"));
+      RemoveJsonPropertyIf(BLEdata, "servicedatauuid", BLEdata.containsKey("model") && BLEdata.containsKey("servicedatauuid"));
 #  endif
 #  if !pubKnownBLEServiceData
       RemoveJsonPropertyIf(BLEdata, "servicedata", BLEdata.containsKey("model") && BLEdata.containsKey("servicedata"));