Fix boot splash loading when path is UID

KoBeWi · Nov 15, 2024 · de7f899 · de7f899
1 parent 98ddec4
commit de7f899
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
@@ -5428,7 +5428,7 @@ void EditorNode::redo() {
 
 bool EditorNode::ensure_main_scene(bool p_from_native) {
 	pick_main_scene->set_meta("from_native", p_from_native); // Whether from play button or native run.
-	String main_scene = GLOBAL_GET("application/run/main_scene");
+	String main_scene = ResourceUID::ensure_path(GLOBAL_GET("application/run/main_scene"));
 
 	if (main_scene.is_empty()) {
 		current_menu_option = -1;

diff --git a/main/main.cpp b/main/main.cpp
@@ -3457,7 +3457,7 @@ void Main::setup_boot_logo() {
 
 	if (show_logo) { //boot logo!
 		const bool boot_logo_image = GLOBAL_DEF_BASIC("application/boot_splash/show_image", true);
-		const String boot_logo_path = String(GLOBAL_DEF_BASIC(PropertyInfo(Variant::STRING, "application/boot_splash/image", PROPERTY_HINT_FILE, "*.png"), String())).strip_edges();
+		const String boot_logo_path = ResourceUID::ensure_path(GLOBAL_DEF_BASIC(PropertyInfo(Variant::STRING, "application/boot_splash/image", PROPERTY_HINT_FILE, "*.png"), String())).strip_edges();
 		const bool boot_logo_scale = GLOBAL_DEF_BASIC("application/boot_splash/fullsize", true);
 		const bool boot_logo_filter = GLOBAL_DEF_BASIC("application/boot_splash/use_filter", true);
 
@@ -4221,7 +4221,7 @@ int Main::start() {
 				}
 #endif
 
-				String icon_path = GLOBAL_GET("application/config/icon");
+				const String icon_path = ResourceUID::ensure_path(GLOBAL_GET("application/config/icon"));
 				if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_ICON) && !icon_path.is_empty() && !has_icon) {
 					Ref<Image> icon;
 					icon.instantiate();