diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-08-01 12:54:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-01 12:54:01 +0200 |
| commit | 8b129b1dfcfc73241c12203a23ec620d6994a551 (patch) | |
| tree | 66119cdec6b25bcf7dc04c3792024ccbceb14e3e | |
| parent | 80143c970136d72819be39c1eaaf800ae89c2cca (diff) | |
| parent | c86aa2a705ab266cbd0942b4df1de693b00cd6a2 (diff) | |
Merge pull request #51112 from Chaosus/fix_doc_drag_crash
Fix crash on doc dragging in script list panel
| -rw-r--r-- | editor/editor_resource_picker.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp index 7d809ea656..9977f5f42c 100644 --- a/editor/editor_resource_picker.cpp +++ b/editor/editor_resource_picker.cpp @@ -505,7 +505,9 @@ bool EditorResourcePicker::_is_drop_valid(const Dictionary &p_drag_data) const { Ref<Resource> res; if (drag_data.has("type") && String(drag_data["type"]) == "script_list_element") { ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(drag_data["script_list_element"]); - res = se->get_edited_resource(); + if (se) { + res = se->get_edited_resource(); + } } else if (drag_data.has("type") && String(drag_data["type"]) == "resource") { res = drag_data["resource"]; } @@ -571,7 +573,9 @@ void EditorResourcePicker::drop_data_fw(const Point2 &p_point, const Variant &p_ Ref<Resource> dropped_resource; if (drag_data.has("type") && String(drag_data["type"]) == "script_list_element") { ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(drag_data["script_list_element"]); - dropped_resource = se->get_edited_resource(); + if (se) { + dropped_resource = se->get_edited_resource(); + } } else if (drag_data.has("type") && String(drag_data["type"]) == "resource") { dropped_resource = drag_data["resource"]; } |