From 5be8545edcf53cd410d0ea14168b5675150106fc Mon Sep 17 00:00:00 2001
From: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
Date: Sun, 13 Nov 2022 20:18:51 +0200
Subject: Windows, Linux: prevent segfault on missing icon

Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
---
 launcher/ui/MainWindow.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'launcher/ui')

diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 4dbac967..4e6ce82c 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -2131,7 +2131,11 @@ void MainWindow::on_actionCreateInstanceShortcut_triggered()
         }
 
         auto icon = APPLICATION->icons()->icon(m_selectedInstance->iconKey());
-        
+        if (icon == nullptr)
+        {
+            icon = APPLICATION->icons()->icon("grass");
+        }
+
         QString iconPath = FS::PathCombine(m_selectedInstance->instanceRoot(), "icon.png");
         
         QFile iconFile(iconPath);
@@ -2162,7 +2166,11 @@ void MainWindow::on_actionCreateInstanceShortcut_triggered()
         }
 #elif defined(Q_OS_WIN)
         auto icon = APPLICATION->icons()->icon(m_selectedInstance->iconKey());
-        
+        if (icon == nullptr)
+        {
+            icon = APPLICATION->icons()->icon("grass");
+        }
+
         QString iconPath = FS::PathCombine(m_selectedInstance->instanceRoot(), "icon.ico");
         
         // part of fix for weird bug involving the window icon being replaced
-- 
cgit