Merge branch 'master' into mqtt

This commit is contained in:
Jonathan Naylor
2023-12-06 17:36:37 +00:00
5 changed files with 17 additions and 10 deletions

View File

@@ -592,7 +592,10 @@ void CM17Control::writeNetwork()
m_networkWatchdog.start();
if (!m_allowEncryption) {
unsigned char type = m_netLSF.getEncryptionType();
CM17LSF lsf;
lsf.setNetwork(netData);
unsigned char type = lsf.getEncryptionType();
if (type != M17_ENCRYPTION_TYPE_NONE) {
m_network->reset();
return;