From 85b5b816cfa28371d9c78097eab22d6ec7438eee Mon Sep 17 00:00:00 2001
From: Kewlan <colin_rehn@hotmail.com>
Date: Wed, 21 Oct 2020 20:36:57 +0200
Subject: Don't ask for profile when there's only one.

---
 src/yuzu/applets/profile_select.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/yuzu/applets/profile_select.cpp')

diff --git a/src/yuzu/applets/profile_select.cpp b/src/yuzu/applets/profile_select.cpp
index dca8835ed..68b76269d 100644
--- a/src/yuzu/applets/profile_select.cpp
+++ b/src/yuzu/applets/profile_select.cpp
@@ -114,6 +114,15 @@ QtProfileSelectionDialog::QtProfileSelectionDialog(QWidget* parent)
 
 QtProfileSelectionDialog::~QtProfileSelectionDialog() = default;
 
+int QtProfileSelectionDialog::exec() {
+    // Skip profile selection when there's only one.
+    if (profile_manager->GetUserCount() == 1) {
+        user_index = 0;
+        return QDialog::Accepted;
+    }
+    QDialog::exec();
+}
+
 void QtProfileSelectionDialog::accept() {
     QDialog::accept();
 }
-- 
cgit v1.2.3


From 9afbcd9e8a346297a3522b61cd80dc3a02a93b59 Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Sun, 25 Oct 2020 09:16:43 -0400
Subject: applets/profile_select: Resolve a warning in exec()

Resolves a warning where not all control paths return a value.
---
 src/yuzu/applets/profile_select.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/yuzu/applets/profile_select.cpp')

diff --git a/src/yuzu/applets/profile_select.cpp b/src/yuzu/applets/profile_select.cpp
index 68b76269d..c9a2f8601 100644
--- a/src/yuzu/applets/profile_select.cpp
+++ b/src/yuzu/applets/profile_select.cpp
@@ -120,7 +120,7 @@ int QtProfileSelectionDialog::exec() {
         user_index = 0;
         return QDialog::Accepted;
     }
-    QDialog::exec();
+    return QDialog::exec();
 }
 
 void QtProfileSelectionDialog::accept() {
-- 
cgit v1.2.3


From f6d4a289d53516789ceb5f90f086ffe8b2822115 Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Sat, 5 Dec 2020 08:37:13 -0500
Subject: applets: Resolve variable shadowing

---
 src/yuzu/applets/profile_select.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/yuzu/applets/profile_select.cpp')

diff --git a/src/yuzu/applets/profile_select.cpp b/src/yuzu/applets/profile_select.cpp
index c9a2f8601..4bf2bfd40 100644
--- a/src/yuzu/applets/profile_select.cpp
+++ b/src/yuzu/applets/profile_select.cpp
@@ -150,8 +150,8 @@ QtProfileSelector::QtProfileSelector(GMainWindow& parent) {
 QtProfileSelector::~QtProfileSelector() = default;
 
 void QtProfileSelector::SelectProfile(
-    std::function<void(std::optional<Common::UUID>)> callback) const {
-    this->callback = std::move(callback);
+    std::function<void(std::optional<Common::UUID>)> callback_) const {
+    callback = std::move(callback_);
     emit MainWindowSelectProfile();
 }
 
-- 
cgit v1.2.3