From 0a67aa5ce4b0aba3553824a1ce9612aacadc600f Mon Sep 17 00:00:00 2001 From: khairul169 Date: Sun, 1 Jul 2018 15:26:29 +0700 Subject: [PATCH] Fix error msg when selecting popupmenu if there is no animation --- editor/plugins/animation_player_editor_plugin.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index 3477a6ec302..93fa8613c1e 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -1102,9 +1102,12 @@ void AnimationPlayerEditor::_animation_about_to_show_menu() { void AnimationPlayerEditor::_animation_tool_menu(int p_option) { - String current = animation->get_item_text(animation->get_selected()); + String current; + if (animation->get_selected() >= 0 && animation->get_selected() < animation->get_item_count()) + current = animation->get_item_text(animation->get_selected()); + Ref anim; - if (current != "") { + if (current != String()) { anim = player->get_animation(current); }