From deb664c781159a88f49ef61cf261c2adcc565dbb Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 14 Feb 2022 12:50:17 +0100 Subject: [PATCH] Also check whether a job is valid before calling enter tree on it. --- prop_instance_merger.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prop_instance_merger.cpp b/prop_instance_merger.cpp index ba3cef4..93c747d 100644 --- a/prop_instance_merger.cpp +++ b/prop_instance_merger.cpp @@ -124,7 +124,7 @@ Ref PropInstanceMerger::get_job() { void PropInstanceMerger::set_job(const Ref &job) { _job = job; - if (is_inside_tree()) { + if (_job.is_valid() && is_inside_tree()) { _job->prop_instance_enter_tree(); } }