From c548f2b570f213ede425c7dd85850c59849712c8 Mon Sep 17 00:00:00 2001
From: AllMeatball <181806857+AllMeatball@users.noreply.github.com>
Date: Wed, 14 May 2025 15:58:06 -0500
Subject: [PATCH] isleapp: Only load icon from IOStream if it's valid

---
 ISLE/isleapp.cpp | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp
index 1d664ba0..2de7d459 100644
--- a/ISLE/isleapp.cpp
+++ b/ISLE/isleapp.cpp
@@ -488,19 +488,21 @@ MxResult IsleApp::SetupWindow()
 		return FAILURE;
 	}
 
+	SDL_IOStream* icon_stream = SDL_IOFromMem(isle_bmp, isle_bmp_len);
 
-	SDL_IOStream *icon_stream = SDL_IOFromMem(isle_bmp, isle_bmp_len);
-	if (!icon_stream) {
-		SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to open SDL_IOStream for icon: %s", SDL_GetError());
+	if (icon_stream) {
+		SDL_Surface* icon = SDL_LoadBMP_IO(icon_stream, true);
+
+		if (icon) {
+			SDL_SetWindowIcon(m_windowHandle, icon);
+			SDL_DestroySurface(icon);
+		}
+		else {
+			SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to load icon: %s", SDL_GetError());
+		}
 	}
-
-	SDL_Surface *icon = SDL_LoadBMP_IO(icon_stream, true);
-
-	if (icon) {
-		SDL_SetWindowIcon(m_windowHandle, icon);
-		SDL_DestroySurface(icon);
-	} else {
-		SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to load icon: %s", SDL_GetError());
+	else {
+		SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to open SDL_IOStream for icon: %s", SDL_GetError());
 	}
 
 	if (!SetupLegoOmni()) {