ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #2574 from ajerick/develop

Browse Source 
fix non-persistent user icon selection in NewInstanceDialog.cpp
This commit is contained in:
Alexandru Ionut Tripon 2024-06-27 08:38:46 +03:00 committed by GitHub
commit 68292aff6c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
launcher/ui/dialogs/NewInstanceDialog.cpp
View File

@ -200,7 +200,7 @@ void NewInstanceDialog::setSuggestedPack(const QString& name, InstanceTask* task
importVersion.clear(); importVersion.clear();
if (!task) { if (!task) {
ui->iconButton->setIcon(APPLICATION->icons()->getIcon("default")); ui->iconButton->setIcon(APPLICATION->icons()->getIcon(InstIconKey));
importIcon = false; importIcon = false;
} }
@ -216,7 +216,7 @@ void NewInstanceDialog::setSuggestedPack(const QString& name, QString version, I
importVersion = std::move(version); importVersion = std::move(version);
if (!task) { if (!task) {
ui->iconButton->setIcon(APPLICATION->icons()->getIcon("default")); ui->iconButton->setIcon(APPLICATION->icons()->getIcon(InstIconKey));
importIcon = false; importIcon = false;
} }
@ -236,6 +236,9 @@ void NewInstanceDialog::setSuggestedIconFromFile(const QString& path, const QStr
void NewInstanceDialog::setSuggestedIcon(const QString& key) void NewInstanceDialog::setSuggestedIcon(const QString& key)
{ {
if (key == "default")
return;
auto icon = APPLICATION->icons()->getIcon(key); auto icon = APPLICATION->icons()->getIcon(key);
importIcon = false; importIcon = false;