mirror of
https://github.com/Almamu/linux-wallpaperengine.git
synced 2025-07-16 06:12:23 +08:00
~ added search for text objects in the backgrounds to prevent crashes for now
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
This commit is contained in:
parent
27b50ffac9
commit
a0ed644491
@ -56,6 +56,7 @@ CObject* CObject::fromJSON (json data)
|
|||||||
auto image_it = data.find ("image");
|
auto image_it = data.find ("image");
|
||||||
auto sound_it = data.find ("sound");
|
auto sound_it = data.find ("sound");
|
||||||
auto particle_it = data.find ("particle");
|
auto particle_it = data.find ("particle");
|
||||||
|
auto text_it = data.find ("text");
|
||||||
|
|
||||||
CObject* object = nullptr;
|
CObject* object = nullptr;
|
||||||
|
|
||||||
@ -101,9 +102,14 @@ CObject* CObject::fromJSON (json data)
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if (text_it != data.end ())
|
||||||
|
{
|
||||||
|
/// TODO: XXXHACK -- TO REMOVE WHEN TEXT SUPPORT IS IMPLEMENTED
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
throw std::runtime_error ("Unkonwn object type detected");
|
throw std::runtime_error (std::string ("Unkonwn object type detected ").append (*name_it));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (effects_it != data.end () && (*effects_it).is_array () == true)
|
if (effects_it != data.end () && (*effects_it).is_array () == true)
|
||||||
|
Loading…
Reference in New Issue
Block a user