Merge branch 'master' into Kenwood

2020-06-13 17:48:03 +01:00 · 2020-06-13 17:48:03 +01:00 · 1ab09e21fe
parent 4c7a2526e5 933b9ef014
commit 1ab09e21fe
2 changed files with 3 additions and 2 deletions
--- a/MMDVMHost.cpp
+++ b/MMDVMHost.cpp
@ -612,7 +612,8 @@ int CMMDVMHost::run()

 		m_pocsag = new CPOCSAGControl(m_pocsagNetwork, m_display);

-		pocsagTimer.start();
+		if (m_pocsagNetwork != NULL)
+			pocsagTimer.start();
 	}

 	bool remoteControlEnabled = m_conf.getRemoteControlEnabled();
--- a/Version.h
+++ b/Version.h
@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H

-const char* VERSION = "20200527";
+const char* VERSION = "20200608";

 #endif