mirrors/linux-wallpaperengine
1
0
Fork 0
mirror of https://github.com/Almamu/linux-wallpaperengine.git synced 2025-09-14 13:56:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

~ Combos can have no default value

Browse Source 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
This commit is contained in:
Alexis Maiquez 2021-12-02 22:00:43 +01:00
parent 342522cd1d
commit d0572b257f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/WallpaperEngine/Render/Shaders/Compiler.cpp
View File

@ -503,7 +503,7 @@ namespace WallpaperEngine::Render::Shaders
{ {
json data = json::parse (content); json data = json::parse (content);
auto combo = jsonFindRequired (data, "combo", "cannot parse combo information"); auto combo = jsonFindRequired (data, "combo", "cannot parse combo information");
auto defvalue = jsonFindRequired (data, "default", "cannot parse combo information"); auto defvalue = data.find ("default");
// add line feed just in case // add line feed just in case
this->m_compiledContent += "\n"; this->m_compiledContent += "\n";
@ -516,7 +516,12 @@ namespace WallpaperEngine::Render::Shaders
if (entry == this->m_combos->end ()) if (entry == this->m_combos->end ())
{ {
// if no combo is defined just load the default settings // if no combo is defined just load the default settings
if ((*defvalue).is_number_float ()) if (defvalue == data.end ())
{
// TODO: PROPERLY SUPPORT EMPTY COMBOS
this->m_combos->insert (std::make_pair <std::string, int> (*combo, 0));
}
else if ((*defvalue).is_number_float ())
{ {
throw std::runtime_error ("float combos not supported"); throw std::runtime_error ("float combos not supported");
} }