comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2026-06-27 14:03:15 -04:00
Code Issues Projects Releases Wiki Activity

linux gcc error related fixes

Browse Source
This commit is contained in:
Charles J. Cliffe
2015-07-14 19:44:19 -04:00
parent 1fdaa112ea
commit f41c14f56c
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AppConfig.cpp
+6 -3
View File
@@ -114,7 +114,10 @@ void DeviceConfig::load(DataNode *node) {
DeviceConfig *AppConfig::getDevice(std::string deviceId) {
DeviceConfig *conf = &deviceConfig[deviceId];
if (deviceConfig.find(deviceId) == deviceConfig.end()) {
deviceConfig[deviceId] = new DeviceConfig();
}
DeviceConfig *conf = deviceConfig[deviceId];
conf->setDeviceId(deviceId);
return conf;
}
@@ -143,10 +146,10 @@ bool AppConfig::save() {
cfg.rootNode()->setName("cubicsdr_config");
DataNode *devices_node = cfg.rootNode()->newChild("devices");
std::map<std::string, DeviceConfig>::iterator device_config_i;
std::map<std::string, DeviceConfig *>::iterator device_config_i;
for (device_config_i = deviceConfig.begin(); device_config_i != deviceConfig.end(); device_config_i++) {
DataNode *device_node = devices_node->newChild("device");
device_config_i->second.save(device_node);
device_config_i->second->save(device_node);
}
std::string cfgFileDir = getConfigDir();