From 927d15b815ff5bbc9693b98fb6ce177b84a76def Mon Sep 17 00:00:00 2001 From: Bojidar Marinov Date: Tue, 21 Mar 2017 13:32:44 +0200 Subject: [PATCH] Suppress error messages when using ConfigFile::get_value and a default is given Fixes #8097 --- core/io/config_file.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/core/io/config_file.cpp b/core/io/config_file.cpp index 052a83168db..65603020831 100644 --- a/core/io/config_file.cpp +++ b/core/io/config_file.cpp @@ -82,8 +82,13 @@ void ConfigFile::set_value(const String &p_section, const String &p_key, const V } Variant ConfigFile::get_value(const String &p_section, const String &p_key, Variant p_default) const { - ERR_FAIL_COND_V(!values.has(p_section), p_default); - ERR_FAIL_COND_V(!values[p_section].has(p_key), p_default); + if (!values.has(p_section) || !values[p_section].has(p_key)) { + if (p_default.get_type() == Variant::NIL) { + ERR_EXPLAIN("Couldn't find the given section/key and no default was given"); + ERR_FAIL_V(p_default); + } + return p_default; + } return values[p_section][p_key]; }