mirror of
https://git.suyu.dev/suyu/suyu.git
synced 2024-11-09 00:12:45 +01:00
Merge pull request #4297 from FearlessTobi/skip-profile-select
main/profile_select: Don't prompt for profile selection when only one is available
This commit is contained in:
commit
9121d35e70
1 changed files with 13 additions and 9 deletions
|
@ -279,6 +279,9 @@ GMainWindow::~GMainWindow() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void GMainWindow::ProfileSelectorSelectProfile() {
|
void GMainWindow::ProfileSelectorSelectProfile() {
|
||||||
|
const Service::Account::ProfileManager manager;
|
||||||
|
int index = 0;
|
||||||
|
if (manager.GetUserCount() != 1) {
|
||||||
QtProfileSelectionDialog dialog(this);
|
QtProfileSelectionDialog dialog(this);
|
||||||
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
|
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
|
||||||
Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint);
|
Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint);
|
||||||
|
@ -287,9 +290,10 @@ void GMainWindow::ProfileSelectorSelectProfile() {
|
||||||
emit ProfileSelectorFinishedSelection(std::nullopt);
|
emit ProfileSelectorFinishedSelection(std::nullopt);
|
||||||
return;
|
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;
|
||||||
|
|
Loading…
Reference in a new issue