From 3aa09fdf2b785f653ee97fa352066c3abd5a1160 Mon Sep 17 00:00:00 2001 From: Honfika Date: Sun, 1 Dec 2013 15:09:01 +0100 Subject: [PATCH] Issue #430: Do not allow loading null config values (use default values instead) --- .../decompiler/flash/configuration/Configuration.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/trunk/src/com/jpexs/decompiler/flash/configuration/Configuration.java b/trunk/src/com/jpexs/decompiler/flash/configuration/Configuration.java index 377bb3e91..d66b0626b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/configuration/Configuration.java +++ b/trunk/src/com/jpexs/decompiler/flash/configuration/Configuration.java @@ -393,8 +393,13 @@ public class Configuration { modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL); Object defaultValue = getDefaultValue(field); + Object value = null; if (config.containsKey(name)) { - field.set(null, new ConfigurationItem(name, defaultValue, config.get(name))); + value = config.get(name); + } + + if (value != null) { + field.set(null, new ConfigurationItem(name, defaultValue, value)); } else { field.set(null, new ConfigurationItem(name, defaultValue)); }