From 06c4ff3eac513bf31a74a2be618e2ff026c1834d Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Mon, 5 Oct 2020 10:11:08 +0100 Subject: [PATCH] Remove crash when going to an unassigned DG-ID. --- DGIdGateway/DGIdGateway.cpp | 11 ++++++++--- DGIdGateway/Version.h | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/DGIdGateway/DGIdGateway.cpp b/DGIdGateway/DGIdGateway.cpp index 3b2da6d..b60093c 100644 --- a/DGIdGateway/DGIdGateway.cpp +++ b/DGIdGateway/DGIdGateway.cpp @@ -415,10 +415,15 @@ int CDGIdGateway::run() dgIdNetwork[dgId]->link(); } - std::string desc = dgIdNetwork[dgId]->getDesc(dgId); - LogMessage("DG-ID set to %u (%s) via RF", dgId, desc.c_str()); + if (dgIdNetwork[dgId] != NULL) { + std::string desc = dgIdNetwork[dgId]->getDesc(dgId); + LogMessage("DG-ID set to %u (%s) via RF", dgId, desc.c_str()); + state = DS_NOTLINKED; + } else { + LogMessage("DG-ID set to %u (None) via RF", dgId); + } + currentDGId = dgId; - state = DS_NOTLINKED; fromRF = true; } diff --git a/DGIdGateway/Version.h b/DGIdGateway/Version.h index 92c8008..f88bd0f 100644 --- a/DGIdGateway/Version.h +++ b/DGIdGateway/Version.h @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20201004"; +const char* VERSION = "20201005"; #endif