Merge pull request #1059 from deXol/develop

[BLE] Remove zero bytes from end of BLE name setting
mooltipass · Jun 28, 2022 · 52e54fc · 52e54fc
2 parents 363ecf5 + d48681e
commit 52e54fc
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/MPDeviceBleImpl.cpp b/src/MPDeviceBleImpl.cpp
@@ -1913,6 +1913,11 @@ void MPDeviceBleImpl::getBleName(const MessageHandlerCbData &cb)
             bleNameArr = DEFAULT_BLE_NAME.toUtf8();
             qWarning() << "Invalid character in BLE name";
         }
+        if (bleNameArr.contains(ZERO_BYTE))
+        {
+            // Cut zero bytes from the end of the array
+            bleNameArr = bleNameArr.left(bleNameArr.indexOf(ZERO_BYTE));
+        }
         cb(true, "", bleNameArr);
     });