From 3f640061797b8fd0e37da2eb290dd6c6445c4bbe Mon Sep 17 00:00:00 2001
From: pineappleEA <pineaea@gmail.com>
Date: Fri, 5 Aug 2022 18:38:07 +0200
Subject: [PATCH] early-access version 2890

---
 README.md                              |  2 +-
 src/yuzu/applets/qt_profile_select.cpp |  1 +
 src/yuzu/main.cpp                      | 12 ++++++++----
 src/yuzu/main.h                        |  2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index c549d9496..97d69e6e0 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 2889.
+This is the source code for early-access 2890.
 
 ## Legal Notice
 
diff --git a/src/yuzu/applets/qt_profile_select.cpp b/src/yuzu/applets/qt_profile_select.cpp
index 826c6c224..c8bcfb223 100755
--- a/src/yuzu/applets/qt_profile_select.cpp
+++ b/src/yuzu/applets/qt_profile_select.cpp
@@ -100,6 +100,7 @@ QtProfileSelectionDialog::QtProfileSelectionDialog(Core::HID::HIDCore& hid_core,
                 }
                 QKeyEvent* event = new QKeyEvent(QEvent::KeyPress, key, Qt::NoModifier);
                 QCoreApplication::postEvent(tree_view, event);
+                SelectUser(tree_view->currentIndex());
             });
 
     const auto& profiles = profile_manager->GetAllUsers();
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 99e9aef7a..8e503d146 100755
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -1589,17 +1589,18 @@ bool GMainWindow::LoadROM(const QString& filename, u64 program_id, std::size_t p
     return true;
 }
 
-void GMainWindow::SelectAndSetCurrentUser() {
+bool GMainWindow::SelectAndSetCurrentUser() {
     QtProfileSelectionDialog dialog(system->HIDCore(), this);
     dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
                           Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint);
     dialog.setWindowModality(Qt::WindowModal);
 
     if (dialog.exec() == QDialog::Rejected) {
-        return;
+        return false;
     }
 
     Settings::values.current_user = dialog.GetIndex();
+    return true;
 }
 
 void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t program_index,
@@ -1633,11 +1634,14 @@ void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t
     Settings::LogSettings();
 
     if (UISettings::values.select_user_on_boot) {
-        SelectAndSetCurrentUser();
+        if (SelectAndSetCurrentUser() == false) {
+            return;
+        }
     }
 
-    if (!LoadROM(filename, program_id, program_index))
+    if (!LoadROM(filename, program_id, program_index)) {
         return;
+    }
 
     system->SetShuttingDown(false);
 
diff --git a/src/yuzu/main.h b/src/yuzu/main.h
index 23b67a14e..e13b38b24 100755
--- a/src/yuzu/main.h
+++ b/src/yuzu/main.h
@@ -218,7 +218,7 @@ private:
     void SetDiscordEnabled(bool state);
     void LoadAmiibo(const QString& filename);
 
-    void SelectAndSetCurrentUser();
+    bool SelectAndSetCurrentUser();
 
     /**
      * Stores the filename in the recently loaded files list.