0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows, Linux: prevent segfault on missing icon

Browse Source 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
This commit is contained in:
ADudeCalledLeo 2022-11-13 20:18:51 +02:00
parent acd50969e0
commit 5be8545edc
No known key found for this signature in database
GPG Key ID: 2E08DA5D6AF36F3B
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
launcher/ui/MainWindow.cpp
View File

@ -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