Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into Kenwood

Browse source
This commit is contained in:
Jonathan Naylor 2020-06-13 17:48:03 +01:00
parent 4c7a2526e5 933b9ef014
commit 1ab09e21fe
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
MMDVMHost.cpp
View file

@ -612,7 +612,8 @@ int CMMDVMHost::run()
m_pocsag = new CPOCSAGControl(m_pocsagNetwork, m_display); m_pocsag = new CPOCSAGControl(m_pocsagNetwork, m_display);
pocsagTimer.start(); if (m_pocsagNetwork != NULL)
pocsagTimer.start();
} }
bool remoteControlEnabled = m_conf.getRemoteControlEnabled(); bool remoteControlEnabled = m_conf.getRemoteControlEnabled();

2
Version.h
View file

@ -19,6 +19,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20200527"; const char* VERSION = "20200608";
#endif #endif