Merge pull request godotengine#97185 from KoBeWi/ID_war

Fix FileSystemDock's EditorContextMenuPlugins
wenqiangwang · Sep 19, 2024 · c8d76c1 · c8d76c1
2 parents d788205 + 5901a7a
commit c8d76c1
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
@@ -2662,8 +2662,11 @@ void FileSystemDock::_file_option(int p_option, const Vector<String> &p_selected
 		} break;
 
 		default: {
-			// Resource conversion commands:
-			if (p_option >= CONVERT_BASE_ID) {
+			if (p_option >= EditorContextMenuPlugin::BASE_ID) {
+				if (!EditorContextMenuPluginManager::get_singleton()->activate_custom_option(EditorContextMenuPlugin::CONTEXT_SLOT_FILESYSTEM, p_option, p_selected)) {
+					EditorContextMenuPluginManager::get_singleton()->activate_custom_option(EditorContextMenuPlugin::CONTEXT_SLOT_FILESYSTEM_CREATE, p_option, p_selected);
+				}
+			} else if (p_option >= CONVERT_BASE_ID) {
 				selected_conversion_id = p_option - CONVERT_BASE_ID;
 				ERR_FAIL_INDEX(selected_conversion_id, (int)cached_valid_conversion_targets.size());
 
@@ -2681,10 +2684,6 @@ void FileSystemDock::_file_option(int p_option, const Vector<String> &p_selected
 					}
 					conversion_id++;
 				}
-			} else {
-				if (!EditorContextMenuPluginManager::get_singleton()->activate_custom_option(EditorContextMenuPlugin::CONTEXT_SLOT_FILESYSTEM, p_option, p_selected)) {
-					EditorContextMenuPluginManager::get_singleton()->activate_custom_option(EditorContextMenuPlugin::CONTEXT_SLOT_FILESYSTEM_CREATE, p_option, p_selected);
-				}
 			}
 			break;
 		}