Merge pull request #8474 from allkhor/pr-fix-cherry-2.1

ScriptEditor: Fixes bug where menu option would be handled twice (2.1)

editor/plugins/script_editor_plugin.cpp

@@ -1552,25 +1552,26 @@ 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 SEARCH_FIND: {
-				help->popup_search();
-			} break;
-			case SEARCH_FIND_NEXT: {
-				help->search_again();
-			} break;
-			case FILE_CLOSE: {
-				_close_current_tab();
-			} break;
-			case CLOSE_DOCS: {
-				_close_docs_tab();
-			} break;
+				case SEARCH_FIND: {
+					help->popup_search();
+				} break;
+				case SEARCH_FIND_NEXT: {
+					help->search_again();
+				} break;
+				case FILE_CLOSE: {
+					_close_current_tab();
+				} break;
+				case CLOSE_DOCS: {
+					_close_docs_tab();
+				} break;
+			}
 		}
 	}
 }