From 160dd09fc2788fea17c8e9e332c2877586640971 Mon Sep 17 00:00:00 2001
From: Aaron <10217842+byteduck@users.noreply.github.com>
Date: Thu, 12 Jan 2023 20:03:31 -0800
Subject: [PATCH] Fix instance account selector face for offline accounts

---
 .../pages/instance/InstanceSettingsPage.cpp   | 26 +++++++++----------
 .../ui/pages/instance/InstanceSettingsPage.h  |  1 +
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.cpp b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
index 24b261ba..4b4c73dc 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.cpp
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
@@ -466,7 +466,7 @@ void InstanceSettingsPage::updateAccountsMenu()
 
     if (defaultAccount) {
         ui->instanceAccountSelector->setText(defaultAccount->profileName());
-        ui->instanceAccountSelector->setIcon(defaultAccount->getFace());
+        ui->instanceAccountSelector->setIcon(getFaceForAccount(defaultAccount));
     } else {
         ui->instanceAccountSelector->setText(tr("No default account"));
         ui->instanceAccountSelector->setIcon(APPLICATION->getThemedIcon("noaccount"));
@@ -480,19 +480,21 @@ void InstanceSettingsPage::updateAccountsMenu()
         if (accountIndex == i) {
             action->setChecked(true);
         }
-
-        auto face = account->getFace();
-        if (!face.isNull()) {
-            action->setIcon(face);
-        } else {
-            action->setIcon(APPLICATION->getThemedIcon("noaccount"));
-        }
-
+        action->setIcon(getFaceForAccount(account));
         accountMenu->addAction(action);
         connect(action, SIGNAL(triggered(bool)), this, SLOT(changeInstanceAccount()));
     }
 }
 
+QIcon InstanceSettingsPage::getFaceForAccount(MinecraftAccountPtr account)
+{
+    if (auto face = account->getFace(); !face.isNull()) {
+        return face;
+    }
+
+    return APPLICATION->getThemedIcon("noaccount");
+}
+
 void InstanceSettingsPage::changeInstanceAccount()
 {
     QAction* sAction = (QAction*)sender();
@@ -506,11 +508,7 @@ void InstanceSettingsPage::changeInstanceAccount()
     m_settings->set("InstanceAccountId", account->profileId());
 
     ui->instanceAccountSelector->setText(account->profileName());
-    if (auto face = account->getFace(); !face.isNull()) {
-        ui->instanceAccountSelector->setIcon(face);
-    } else {
-        ui->instanceAccountSelector->setIcon(APPLICATION->getThemedIcon("noaccount"));
-    }
+    ui->instanceAccountSelector->setIcon(getFaceForAccount(account));
 }
 
 void InstanceSettingsPage::on_maxMemSpinBox_valueChanged(int i)
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.h b/launcher/ui/pages/instance/InstanceSettingsPage.h
index b80db99a..cb6fbae0 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.h
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.h
@@ -94,6 +94,7 @@ private slots:
     void globalSettingsButtonClicked(bool checked);
 
     void updateAccountsMenu();
+    QIcon getFaceForAccount(MinecraftAccountPtr account);
     void changeInstanceAccount();
 
 private: