MMDVM/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway synced 2025-12-21 05:25:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #96 from f1rmb/fix_gps_segfault

Browse Source 
Fix segfault when GPS is not enabled in config (NULL reference usage).
This commit is contained in:
Jonathan Naylor
2020-11-04 10:38:55 +00:00
committed by GitHub
parent 023b5d48e0 4ebc7f1af7
commit b68415fe64
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
DMRGateway.cpp
View File

@@ -1373,7 +1373,7 @@ bool CDMRGateway::createDMRNetwork1()
} }
#if defined(USE_GPSD) #if defined(USE_GPSD)
if (location) if (location && (m_gpsd != NULL))
m_gpsd->addNetwork(m_dmrNetwork1); m_gpsd->addNetwork(m_dmrNetwork1);
#endif #endif
@@ -1540,7 +1540,7 @@ bool CDMRGateway::createDMRNetwork2()
} }
#if defined(USE_GPSD) #if defined(USE_GPSD)
if (location) if (location && (m_gpsd != NULL))
m_gpsd->addNetwork(m_dmrNetwork2); m_gpsd->addNetwork(m_dmrNetwork2);
#endif #endif
@@ -1707,7 +1707,7 @@ bool CDMRGateway::createDMRNetwork3()
} }
#if defined(USE_GPSD) #if defined(USE_GPSD)
if (location) if (location && (m_gpsd != NULL))
m_gpsd->addNetwork(m_dmrNetwork3); m_gpsd->addNetwork(m_dmrNetwork3);
#endif #endif
@@ -1874,7 +1874,7 @@ bool CDMRGateway::createDMRNetwork4()
} }
#if defined(USE_GPSD) #if defined(USE_GPSD)
if (location) if (location && (m_gpsd != NULL))
m_gpsd->addNetwork(m_dmrNetwork4); m_gpsd->addNetwork(m_dmrNetwork4);
#endif #endif
@@ -2041,7 +2041,7 @@ bool CDMRGateway::createDMRNetwork5()
} }
#if defined(USE_GPSD) #if defined(USE_GPSD)
if (location) if (location && (m_gpsd != NULL))
m_gpsd->addNetwork(m_dmrNetwork5); m_gpsd->addNetwork(m_dmrNetwork5);
#endif #endif