GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 08:37:25 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#1209 updates tuner manager to properly deref usb devices on discovery. Updates tuner editors to separate enable/disable from tuner error state. Updates settings manager to disable auto-fail when loading xml file when unknown tags are encountered so that users' existing configs don't fail on startup and erase their existing settings. (#1211)

Browse Source 
Co-authored-by: Denny Sheirer <sheirerd@ainfosec.com>
This commit is contained in:
Denny Sheirer
2022-04-23 06:05:12 -04:00
committed by GitHub
parent 7f5ad7eb20
commit 1b90e0b50c
9 changed files with 227 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/io/github/dsheirer/settings/SettingsManager.java
View File

@@ -18,6 +18,7 @@
*/
package io.github.dsheirer.settings;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule;
@@ -272,7 +273,8 @@ public class SettingsManager implements Listener<TunerConfigurationEvent>
JacksonXmlModule xmlModule = new JacksonXmlModule();
xmlModule.setDefaultUseWrapper(false);
ObjectMapper objectMapper = new XmlMapper(xmlModule);
ObjectMapper objectMapper = new XmlMapper(xmlModule)
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
try(InputStream in = Files.newInputStream(settingsPath))
{