applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-28 18:05:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[libcalamares] Asking for type of undefined node throws

Browse source 
- Use YAML-CPP API for finding out if a node has a value at all.
 - Asking for Type() of an undefined or NULL node throws an
   exception, so the existing code didn't **actually** catch
   cases where a required setting wasn't set at all.
This commit is contained in:
Adriaan de Groot 2018-06-20 15:59:23 +02:00
parent ec09272b81
commit d59a44be44
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libcalamares/Settings.cpp
View file

@ -32,7 +32,7 @@
static bool static bool
hasValue( const YAML::Node& v ) hasValue( const YAML::Node& v )
{ {
return !( ( v.Type() == YAML::NodeType::Null ) || ( v.Type() == YAML::NodeType::Undefined ) ); return v.IsDefined() && !v.IsNull();
} }
/** Helper function to grab a QString out of the config, and to warn if not present. */ /** Helper function to grab a QString out of the config, and to warn if not present. */