ensure network is a valid instantiation before trying to run;

2 years ago · 9e27875bb8
parent 5b5efcbe9d
commit 9e27875bb8
3 changed files with 6 additions and 3 deletions
--- a/src/host/dmr/Slot.cpp
+++ b/src/host/dmr/Slot.cpp
@ -482,7 +482,8 @@ void Slot::clock()
        m_adjSiteUpdate.clock(ms);
        if (m_adjSiteUpdate.isRunning() && m_adjSiteUpdate.hasExpired()) {
            if (m_rfState == RS_RF_LISTENING && m_netState == RS_NET_IDLE) {
-                m_network->announceAffiliationUpdate(m_affiliations->grpAffTable());
+                if (m_network != nullptr)
+                    m_network->announceAffiliationUpdate(m_affiliations->grpAffTable());
                m_adjSiteUpdate.start();
            }
        }
--- a/src/host/nxdn/Control.cpp
+++ b/src/host/nxdn/Control.cpp
@ -567,7 +567,8 @@ void Control::clock(uint32_t ms)
        m_adjSiteUpdate.clock(ms);
        if (m_adjSiteUpdate.isRunning() && m_adjSiteUpdate.hasExpired()) {
            if (m_rfState == RS_RF_LISTENING && m_netState == RS_NET_IDLE) {
-                m_network->announceAffiliationUpdate(m_affiliations.grpAffTable());
+                if (m_network != nullptr)
+                    m_network->announceAffiliationUpdate(m_affiliations.grpAffTable());
                m_adjSiteUpdate.start();
            }
        }
--- a/src/host/p25/Control.cpp
+++ b/src/host/p25/Control.cpp
@ -819,7 +819,8 @@ void Control::clock(uint32_t ms)
        if (m_adjSiteUpdate.isRunning() && m_adjSiteUpdate.hasExpired()) {
            if (m_rfState == RS_RF_LISTENING && m_netState == RS_NET_IDLE) {
                m_control->writeAdjSSNetwork();
-                m_network->announceAffiliationUpdate(m_affiliations.grpAffTable());
+                if (m_network != nullptr)
+                    m_network->announceAffiliationUpdate(m_affiliations.grpAffTable());
                m_adjSiteUpdate.start();
            }
        }