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

Merge https://github.com/Almamu/linux-wallpaperengine

Browse Source
This commit is contained in:
ambidot 2020-07-29 18:51:17 -05:00
commit d0a19e87e3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wallpaperengine/project.cpp
View File

@ -19,13 +19,6 @@ namespace wp
json::const_iterator name_it = this->m_projectFile.find ("title"); json::const_iterator name_it = this->m_projectFile.find ("title");
json::const_iterator type_it = this->m_projectFile.find ("type"); json::const_iterator type_it = this->m_projectFile.find ("type");
if (file_it != this->m_projectFile.end ())
{
// load scene file
this->m_file = (*file_it).get <std::string> ().c_str ();
this->m_scene = new scene (this->m_file);
}
if (type_it != this->m_projectFile.end ()) if (type_it != this->m_projectFile.end ())
{ {
this->m_type = type_it.value (); this->m_type = type_it.value ();
@ -41,6 +34,13 @@ namespace wp
{ {
throw std::runtime_error ("Only scene wallpapers are supported"); throw std::runtime_error ("Only scene wallpapers are supported");
} }
if (file_it != this->m_projectFile.end ())
{
// load scene file
this->m_file = (*file_it).get <std::string> ().c_str ();
this->m_scene = new scene (this->m_file);
}
} }
scene* project::getScene () scene* project::getScene ()