fix(config_compiler): null value should not overwrite a normal key in…

… a merged tree
rime · Sep 15, 2017 · 4ecae44 · 4ecae44
1 parent a862298
commit 4ecae44
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/rime/config/config_compiler.cc b/src/rime/config/config_compiler.cc
@@ -140,7 +140,7 @@ inline static bool IsMerging(const string& key,
                              bool merge_tree) {
   return key == ConfigCompiler::MERGE_DIRECTIVE ||
       boost::ends_with(key, ADD_SUFFIX_OPERATOR) ||
-      (merge_tree && Is<ConfigMap>(value) &&
+      (merge_tree && (!value || Is<ConfigMap>(value)) &&
        !boost::ends_with(key, EQU_SUFFIX_OPERATOR));
 }