Merge branch 'bugfix/FaultyIrcddbReport' into develop fixes #27

DStarGateway/DStarGatewayApp.cpp

@@ -263,8 +263,8 @@ bool CDStarGatewayApp::createThread()
 								rptrConfig.reflector,
 								rptrConfig.reflectorAtStartup,
 								rptrConfig.reflectorReconnect,
-								rptrConfig.frequency,
 								drats.enabled,
+								rptrConfig.frequency,
 								rptrConfig.offset,
 								rptrConfig.range,
 								rptrConfig.latitude,

DStarGateway/DStarGatewayConfig.cpp

@@ -247,9 +247,9 @@ bool CDStarGatewayConfig::loadRepeaters(const CConfig & cfg)
 		ret = cfg.getValue(section, "latitude", repeater->latitude, -90.0, 90.0, m_gateway.latitude) && ret;
 		ret = cfg.getValue(section, "longitude", repeater->longitude, -180.0, 180.0, m_gateway.longitude) && ret;
 		ret = cfg.getValue(section, "agl", repeater->agl, 0, 1000.0, 0.0) && ret;
-		ret = cfg.getValue(section, "description1", m_gateway.description1, 0, 1024, "") && ret;
-		ret = cfg.getValue(section, "description2", m_gateway.description2, 0, 1024, "") && ret;
-		ret = cfg.getValue(section, "url", m_gateway.url, 0, 1024, "") && ret;;
+		ret = cfg.getValue(section, "description1", repeater->description1, 0, 1024, m_gateway.description1) && ret;
+		ret = cfg.getValue(section, "description2", repeater->description2, 0, 1024, m_gateway.description2) && ret;
+		ret = cfg.getValue(section, "url", repeater->url, 0, 1024, m_gateway.url) && ret;;
 		ret = cfg.getValue(section, "band1", repeater->band1, 0, 255, 0) && ret;
 		ret = cfg.getValue(section, "band2", repeater->band2, 0, 255, 0) && ret;
 		ret = cfg.getValue(section, "band3", repeater->band3, 0, 255, 0) && ret;