Merge pull request godotengine#96197 from jsjtxietian/splash-msg

akien-mga · akien-mga · commit 8186fabc8f91 · 2024-08-29T10:36:38.000+02:00
Improve error message when loading non-PNG splash image
diff --git a/main/main.cpp b/main/main.cpp
@@ -3394,7 +3394,8 @@ void Main::setup_boot_logo() {
 				boot_logo.instantiate();
 				Error load_err = ImageLoader::load_image(boot_logo_path, boot_logo);
 				if (load_err) {
-					ERR_PRINT("Non-existing or invalid boot splash at '" + boot_logo_path + "'. Loading default splash.");
+					String msg = (boot_logo_path.ends_with(".png") ? "" : "The only supported format is PNG.");
+					ERR_PRINT("Non-existing or invalid boot splash at '" + boot_logo_path + +"'. " + msg + " Loading default splash.");
 				}
 			}
 		} else {

Original file line number	Diff line number	Diff line change
`@@ -3394,7 +3394,8 @@ void Main::setup_boot_logo() {`
`3394`	`3394`	`boot_logo.instantiate();`
`3395`	`3395`	`Error load_err = ImageLoader::load_image(boot_logo_path, boot_logo);`
`3396`	`3396`	`if (load_err) {`
`3397`		`- ERR_PRINT("Non-existing or invalid boot splash at '" + boot_logo_path + "'. Loading default splash.");`
	`3397`	`+ String msg = (boot_logo_path.ends_with(".png") ? "" : "The only supported format is PNG.");`
	`3398`	`+ ERR_PRINT("Non-existing or invalid boot splash at '" + boot_logo_path + +"'. " + msg + " Loading default splash.");`
`3398`	`3399`	`}`
`3399`	`3400`	`}`
`3400`	`3401`	`} else {`