Merge pull request godotengine#107686 from vaner-org/filesystem-main-scene-check-uid

akien-mga · akien-mga · commit e1d3fe873b16 · 2025-06-21T11:14:06.000+02:00
Check UID to disable "Set as Main Scene" in FileSystemDock
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
@@ -3299,7 +3299,7 @@ void FileSystemDock::_file_and_folders_fill_popup(PopupMenu *p_popup, const Vect
 			if (filenames.size() == 1) {
 				p_popup->add_icon_item(get_editor_theme_icon(SNAME("Load")), TTRC("Open Scene"), FILE_MENU_OPEN);
 				p_popup->add_icon_item(get_editor_theme_icon(SNAME("CreateNewSceneFrom")), TTRC("New Inherited Scene"), FILE_MENU_INHERIT);
-				if (GLOBAL_GET("application/run/main_scene") != filenames[0]) {
+				if (ResourceUID::ensure_path(GLOBAL_GET("application/run/main_scene")) != filenames[0]) {
 					p_popup->add_icon_item(get_editor_theme_icon(SNAME("PlayScene")), TTRC("Set as Main Scene"), FILE_MENU_MAIN_SCENE);
 				}
 			} else {

Original file line number	Diff line number	Diff line change
`@@ -3299,7 +3299,7 @@ void FileSystemDock::_file_and_folders_fill_popup(PopupMenu *p_popup, const Vect`
`3299`	`3299`	`if (filenames.size() == 1) {`
`3300`	`3300`	`p_popup->add_icon_item(get_editor_theme_icon(SNAME("Load")), TTRC("Open Scene"), FILE_MENU_OPEN);`
`3301`	`3301`	`p_popup->add_icon_item(get_editor_theme_icon(SNAME("CreateNewSceneFrom")), TTRC("New Inherited Scene"), FILE_MENU_INHERIT);`
`3302`		`- if (GLOBAL_GET("application/run/main_scene") != filenames[0]) {`
	`3302`	`+ if (ResourceUID::ensure_path(GLOBAL_GET("application/run/main_scene")) != filenames[0]) {`
`3303`	`3303`	`p_popup->add_icon_item(get_editor_theme_icon(SNAME("PlayScene")), TTRC("Set as Main Scene"), FILE_MENU_MAIN_SCENE);`
`3304`	`3304`	`}`
`3305`	`3305`	`} else {`