From 2bd5ea70e3399a091f75505c49e78dde1ec40182 Mon Sep 17 00:00:00 2001 From: Alexis Maiquez Date: Wed, 29 Jul 2020 10:59:49 +0200 Subject: [PATCH] ~ fixed scene file being loaded before the type of background was checked (fixes crash on #23) Signed-off-by: Alexis Maiquez --- wallpaperengine/project.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/wallpaperengine/project.cpp b/wallpaperengine/project.cpp index b812014..aabdf14 100644 --- a/wallpaperengine/project.cpp +++ b/wallpaperengine/project.cpp @@ -19,13 +19,6 @@ namespace wp json::const_iterator name_it = this->m_projectFile.find ("title"); 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 ().c_str (); - this->m_scene = new scene (this->m_file); - } - if (type_it != this->m_projectFile.end ()) { this->m_type = type_it.value (); @@ -40,6 +33,13 @@ namespace wp { 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 ().c_str (); + this->m_scene = new scene (this->m_file); + } } scene* project::getScene ()