Merge branch 'master' into loek/audio

2 files changed, 5 insertions, 7 deletions

diff --git a/src/crepe/api/BehaviorScript.hpp b/src/crepe/api/BehaviorScript.hpp
index 6de0157..b9bb1e2 100644
--- a/src/crepe/api/BehaviorScript.hpp
+++ b/src/crepe/api/BehaviorScript.hpp
@@ -13,14 +13,12 @@ template <class T, typename... Args>
 BehaviorScript & BehaviorScript::set_script(Args &&... args) {
 	dbg_trace();
 	static_assert(std::is_base_of<Script, T>::value);
-	Script * s = new T(std::forward<Args>(args)...);
-	Mediator & mediator = this->mediator;
+	this->script = std::unique_ptr<Script>(new T(std::forward<Args>(args)...));
 
-	s->game_object_id = this->game_object_id;
-	s->active = this->active;
-	s->mediator = mediator;
+	this->script->game_object_id = this->game_object_id;
+	this->script->active = this->active;
+	this->script->mediator = this->mediator;
 
-	this->script = std::unique_ptr<Script>(s);
 	return *this;
 }
 
diff --git a/src/crepe/api/LoopManager.hpp b/src/crepe/api/LoopManager.hpp
index cd6bd02..266758a 100644
--- a/src/crepe/api/LoopManager.hpp
+++ b/src/crepe/api/LoopManager.hpp
@@ -38,10 +38,10 @@ void LoopManager::load_system() {
 	static_assert(is_base_of<System, T>::value,
 				  "load_system must recieve a derivative class of System");
 
-	System * system = new T(this->mediator);
 	const type_info & type = typeid(T);
 	if (this->systems.contains(type))
 		throw runtime_error(format("LoopManager: {} is already initialized", type.name()));
+	System * system = new T(this->mediator);
 	this->systems[type] = unique_ptr<System>(system);
 }