Fix a crash in preset plugin when config was malformed

Zebrenka · Sep 12, 2013 · 9057175 · 9057175
1 parent fb08c11
commit 9057175
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/flexget/utils/tools.py b/flexget/utils/tools.py
@@ -180,7 +180,7 @@ def merge_dict_from_to(d1, d2):
                     merge_dict_from_to(d1[k], d2[k])
                 elif isinstance(v, list):
                     d2[k].extend(copy.deepcopy(v))
-                elif isinstance(v, (basestring, bool, int, float)):
+                elif isinstance(v, (basestring, bool, int, float, type(None))):
                     pass
                 else:
                     raise Exception('Unknown type: %s value: %s in dictionary' % (type(v), repr(v)))