diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-11-06 22:13:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-06 22:13:19 +0100 |
| commit | 1e6537bcc8f79b00ff28275277a62e3e94cdd894 (patch) | |
| tree | 925e76f570b441430b1a45a0e6c10af4d9e1c3da | |
| parent | a8e79f1a6557b03a5c578f0130aa2f76620ac7c3 (diff) | |
| parent | 34d1cea6b88b2ea6a4c9e31a188d90a6cef18a89 (diff) | |
Merge pull request #23537 from fire/visualscript-virtual-_function-crash-23536
Fix creating a visual script virtual function after minimizing crashes #23536 and misc vs warning
| -rw-r--r-- | modules/visual_script/visual_script_editor.cpp | 2 | ||||
| -rw-r--r-- | modules/visual_script/visual_script_editor.h | 2 | ||||
| -rw-r--r-- | scene/gui/tree.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/visual_script/visual_script_editor.cpp b/modules/visual_script/visual_script_editor.cpp index 03f3e67e5d..c5f2070963 100644 --- a/modules/visual_script/visual_script_editor.cpp +++ b/modules/visual_script/visual_script_editor.cpp @@ -3653,7 +3653,7 @@ VisualScriptEditor::VisualScriptEditor() { new_virtual_method_select = memnew(VisualScriptPropertySelector); add_child(new_virtual_method_select); new_virtual_method_select->connect("selected", this, "_selected_new_virtual_method"); - new_virtual_method_select->get_cancel()->connect("pressed", this, "_selected_new_virtual_method"); + new_virtual_method_select->get_cancel(); member_popup = memnew(PopupMenu); add_child(member_popup); diff --git a/modules/visual_script/visual_script_editor.h b/modules/visual_script/visual_script_editor.h index 97c75dae94..ce3245bc28 100644 --- a/modules/visual_script/visual_script_editor.h +++ b/modules/visual_script/visual_script_editor.h @@ -176,7 +176,7 @@ class VisualScriptEditor : public ScriptEditorBase { void _cancel_connect_node(); void _create_new_node(const String &p_text, const String &p_category, const Vector2 &p_point); - void _selected_new_virtual_method(const String &p_text = String(""), const String &p_category = String(""), const bool p_connecting = true); + void _selected_new_virtual_method(const String &p_text, const String &p_category, const bool p_connecting); int error_line; diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 0c11181f98..31f7a21114 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -2519,7 +2519,7 @@ void Tree::_gui_input(Ref<InputEvent> p_event) { pressing_for_editor = false; } - if (cache.click_type == Cache::CLICK_BUTTON) { + if (cache.click_type == Cache::CLICK_BUTTON && cache.click_item != NULL) { // make sure in case of wrong reference after reconstructing whole TreeItems cache.click_item = get_item_at_position(cache.click_pos); emit_signal("button_pressed", cache.click_item, cache.click_column, cache.click_id); |