VERY experimental Nintendo Switch 2 emulator
C++
Controller bugfixes in profile select (#8716)
Steve6907d1758dbc
diff --git a/src/yuzu/applets/qt_profile_select.cpp b/src/yuzu/applets/qt_profile_select.cppindex 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.cppindex 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 preturn 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_tSettings::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.hindex 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.