From cd5bbf0f04696d6d44dae8c4a4e5f768a70019de Mon Sep 17 00:00:00 2001 From: Steve <110565931+jonesyUK@users.noreply.github.com> Date: Fri, 5 Aug 2022 08:02:04 -0700 Subject: [PATCH] Controller bugfixes in profile select (#8716) * Controller bugfixes in profile select, closes #8265 2 fixes for using a controller in profile select dialog. Pressing 'B' cancels the launch of the game Using controller to select a profile now correctly sets the index to use for the launch * Added brackets to if statements as requested. --- src/yuzu/applets/qt_profile_select.cpp | 1 + src/yuzu/main.cpp | 12 ++++++++---- src/yuzu/main.h | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/yuzu/applets/qt_profile_select.cpp b/src/yuzu/applets/qt_profile_select.cpp index 826c6c2248..c8bcfb2231 100644 --- 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 f8c2340828..dc7b343d95 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1588,17 +1588,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, @@ -1632,11 +1633,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 23b67a14ed..e13b38b241 100644 --- 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.