From 908bef8eee145408bbf660e873279a978a0acb74 Mon Sep 17 00:00:00 2001
From: bruvzg <7645683+bruvzg@users.noreply.github.com>
Date: Sun, 20 Nov 2022 13:16:16 +0200
Subject: [Export] Use image loader directly to avoid "resource as image file"
 errors.

---
 platform/macos/export/export_plugin.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'platform/macos')

diff --git a/platform/macos/export/export_plugin.cpp b/platform/macos/export/export_plugin.cpp
index ae8c802caf..5860a4f0ae 100644
--- a/platform/macos/export/export_plugin.cpp
+++ b/platform/macos/export/export_plugin.cpp
@@ -34,6 +34,7 @@
 #include "lipo.h"
 #include "macho.h"
 
+#include "core/io/image_loader.h"
 #include "core/string/translation.h"
 #include "editor/editor_node.h"
 #include "editor/editor_paths.h"
@@ -1269,8 +1270,10 @@ Error EditorExportPlatformMacOS::export_project(const Ref<EditorExportPreset> &p
 						icon->get_buffer(&data.write[0], icon->get_length());
 					}
 				} else {
-					Ref<Image> icon = Image::load_from_file(iconpath);
-					if (icon.is_valid() && !icon->is_empty()) {
+					Ref<Image> icon;
+					icon.instantiate();
+					err = ImageLoader::load_image(iconpath, icon);
+					if (err == OK && !icon->is_empty()) {
 						_make_icon(p_preset, icon, data);
 					}
 				}
-- 
cgit v1.2.3