Browse Source
Merge pull request #4297 from FearlessTobi/skip-profile-select
main/profile_select: Don't prompt for profile selection when only one is available
pull/15/merge
bunnei
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
13 additions and
9 deletions
-
src/yuzu/main.cpp
|
|
|
@ -279,17 +279,21 @@ GMainWindow::~GMainWindow() { |
|
|
|
} |
|
|
|
|
|
|
|
void GMainWindow::ProfileSelectorSelectProfile() { |
|
|
|
QtProfileSelectionDialog dialog(this); |
|
|
|
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint | |
|
|
|
Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint); |
|
|
|
dialog.setWindowModality(Qt::WindowModal); |
|
|
|
if (dialog.exec() == QDialog::Rejected) { |
|
|
|
emit ProfileSelectorFinishedSelection(std::nullopt); |
|
|
|
return; |
|
|
|
const Service::Account::ProfileManager manager; |
|
|
|
int index = 0; |
|
|
|
if (manager.GetUserCount() != 1) { |
|
|
|
QtProfileSelectionDialog dialog(this); |
|
|
|
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint | |
|
|
|
Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint); |
|
|
|
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>(dialog.GetIndex())); |
|
|
|
const auto uuid = manager.GetUser(static_cast<std::size_t>(index)); |
|
|
|
if (!uuid.has_value()) { |
|
|
|
emit ProfileSelectorFinishedSelection(std::nullopt); |
|
|
|
return; |
|
|
|
|