From a48dc9aa17308beb7395372751500925837841a5 Mon Sep 17 00:00:00 2001
From: Paulb23 <p_batty@hotmail.co.uk>
Date: Sun, 17 Sep 2017 13:19:38 +0000
Subject: Fixed segfault on loading text editor theme

---
 editor/plugins/script_editor_plugin.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'editor/plugins')

diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp
index 44a9bc6d2e..9af5885a17 100644
--- a/editor/plugins/script_editor_plugin.cpp
+++ b/editor/plugins/script_editor_plugin.cpp
@@ -1682,9 +1682,10 @@ bool ScriptEditor::edit(const Ref<Script> &p_script, int p_line, int p_col, bool
 			break;
 	}
 	ERR_FAIL_COND_V(!se, false);
-	tab_container->add_child(se);
 
+	// load script before adding as child else editor will crash at theme loading
 	se->set_edited_script(p_script);
+	tab_container->add_child(se);
 	se->set_tooltip_request_func("_get_debug_tooltip", this);
 	if (se->get_edit_menu()) {
 		se->get_edit_menu()->hide();
-- 
cgit v1.2.3