Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4297 from FearlessTobi/skip-profile-select

Browse source 
main/profile_select: Don't prompt for profile selection when only one is available
This commit is contained in:
bunnei 2020-07-16 09:45:09 -04:00 committed by GitHub
commit 9121d35e70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/yuzu/main.cpp
View file

@ -279,17 +279,21 @@ GMainWindow::~GMainWindow() {
} }
void GMainWindow::ProfileSelectorSelectProfile() { void GMainWindow::ProfileSelectorSelectProfile() {
QtProfileSelectionDialog dialog(this); const Service::Account::ProfileManager manager;
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint | int index = 0;
Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint); if (manager.GetUserCount() != 1) {
dialog.setWindowModality(Qt::WindowModal); QtProfileSelectionDialog dialog(this);
if (dialog.exec() == QDialog::Rejected) { dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
emit ProfileSelectorFinishedSelection(std::nullopt); Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint);
return; dialog.setWindowModality(Qt::WindowModal);
if (dialog.exec() == QDialog::Rejected) {
emit ProfileSelectorFinishedSelection(std::nullopt);
return;
}
index = dialog.GetIndex();
} }
Service::Account::ProfileManager manager; const auto uuid = manager.GetUser(static_cast<std::size_t>(index));
const auto uuid = manager.GetUser(static_cast<std::size_t>(dialog.GetIndex()));
if (!uuid.has_value()) { if (!uuid.has_value()) {
emit ProfileSelectorFinishedSelection(std::nullopt); emit ProfileSelectorFinishedSelection(std::nullopt);
return; return;