diff options
| author | Andreas Haas <Hinsbart@users.noreply.github.com> | 2017-04-17 11:55:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-17 11:55:42 +0200 |
| commit | 95fe6b5d8c42faef20c9f69cfc1883ffd9ce5104 (patch) | |
| tree | 26138f3ee718550fe3ff77efcef8f6115fca03c2 | |
| parent | 60886b8055f601a3994a9c3717dd18da10778dd6 (diff) | |
| parent | 97c385dbb8fc6fd0766fdae65a877dc8f04dac4c (diff) | |
Merge pull request #8433 from neikeq/pr-fix-smth
ScriptEditor: Fixes bug where menu option would be handled twice
| -rw-r--r-- | editor/plugins/script_editor_plugin.cpp | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 8ce0f51211..c94ab706bc 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -878,28 +878,29 @@ void ScriptEditor::_menu_option(int p_option) { } } } - } + } else { - EditorHelp *help = tab_container->get_current_tab_control()->cast_to<EditorHelp>(); - if (help) { + EditorHelp *help = tab_container->get_current_tab_control()->cast_to<EditorHelp>(); + if (help) { - switch (p_option) { + switch (p_option) { - case HELP_SEARCH_FIND: { - help->popup_search(); - } break; - case HELP_SEARCH_FIND_NEXT: { - help->search_again(); - } break; - case FILE_CLOSE: { - _close_current_tab(); - } break; - case CLOSE_DOCS: { - _close_docs_tab(); - } break; - case CLOSE_ALL: { - _close_all_tabs(); - } break; + case HELP_SEARCH_FIND: { + help->popup_search(); + } break; + case HELP_SEARCH_FIND_NEXT: { + help->search_again(); + } break; + case FILE_CLOSE: { + _close_current_tab(); + } break; + case CLOSE_DOCS: { + _close_docs_tab(); + } break; + case CLOSE_ALL: { + _close_all_tabs(); + } break; + } } } } |