diff options
| author | 2022-02-05 12:29:09 -0500 | |
|---|---|---|
| committer | 2022-02-05 13:56:21 -0500 | |
| commit | dfe11d72e3eb14dee718b7fa67a673514d199f20 (patch) | |
| tree | f21885d513c2df4bb409e17016e0996815e37569 /src/core/frontend/applets | |
| parent | common: uuid: Add AsU128() (diff) | |
| download | yuzu-dfe11d72e3eb14dee718b7fa67a673514d199f20.tar.gz yuzu-dfe11d72e3eb14dee718b7fa67a673514d199f20.tar.xz yuzu-dfe11d72e3eb14dee718b7fa67a673514d199f20.zip | |
profile: Migrate to the new UUID implementation
Diffstat (limited to 'src/core/frontend/applets')
| -rw-r--r-- | src/core/frontend/applets/profile_select.cpp | 5 | ||||
| -rw-r--r-- | src/core/frontend/applets/profile_select.h | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/core/frontend/applets/profile_select.cpp b/src/core/frontend/applets/profile_select.cpp index 3e4f90be2..a7ff2ccf9 100644 --- a/src/core/frontend/applets/profile_select.cpp +++ b/src/core/frontend/applets/profile_select.cpp | |||
| @@ -11,10 +11,9 @@ namespace Core::Frontend { | |||
| 11 | ProfileSelectApplet::~ProfileSelectApplet() = default; | 11 | ProfileSelectApplet::~ProfileSelectApplet() = default; |
| 12 | 12 | ||
| 13 | void DefaultProfileSelectApplet::SelectProfile( | 13 | void DefaultProfileSelectApplet::SelectProfile( |
| 14 | std::function<void(std::optional<Common::UUID>)> callback) const { | 14 | std::function<void(std::optional<Common::NewUUID>)> callback) const { |
| 15 | Service::Account::ProfileManager manager; | 15 | Service::Account::ProfileManager manager; |
| 16 | callback(manager.GetUser(Settings::values.current_user.GetValue()) | 16 | callback(manager.GetUser(Settings::values.current_user.GetValue()).value_or(Common::NewUUID{})); |
| 17 | .value_or(Common::UUID{Common::INVALID_UUID})); | ||
| 18 | LOG_INFO(Service_ACC, "called, selecting current user instead of prompting..."); | 17 | LOG_INFO(Service_ACC, "called, selecting current user instead of prompting..."); |
| 19 | } | 18 | } |
| 20 | 19 | ||
diff --git a/src/core/frontend/applets/profile_select.h b/src/core/frontend/applets/profile_select.h index 3506b9885..5b2346e72 100644 --- a/src/core/frontend/applets/profile_select.h +++ b/src/core/frontend/applets/profile_select.h | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | #include <functional> | 7 | #include <functional> |
| 8 | #include <optional> | 8 | #include <optional> |
| 9 | #include "common/uuid.h" | 9 | #include "common/new_uuid.h" |
| 10 | 10 | ||
| 11 | namespace Core::Frontend { | 11 | namespace Core::Frontend { |
| 12 | 12 | ||
| @@ -14,12 +14,13 @@ class ProfileSelectApplet { | |||
| 14 | public: | 14 | public: |
| 15 | virtual ~ProfileSelectApplet(); | 15 | virtual ~ProfileSelectApplet(); |
| 16 | 16 | ||
| 17 | virtual void SelectProfile(std::function<void(std::optional<Common::UUID>)> callback) const = 0; | 17 | virtual void SelectProfile( |
| 18 | std::function<void(std::optional<Common::NewUUID>)> callback) const = 0; | ||
| 18 | }; | 19 | }; |
| 19 | 20 | ||
| 20 | class DefaultProfileSelectApplet final : public ProfileSelectApplet { | 21 | class DefaultProfileSelectApplet final : public ProfileSelectApplet { |
| 21 | public: | 22 | public: |
| 22 | void SelectProfile(std::function<void(std::optional<Common::UUID>)> callback) const override; | 23 | void SelectProfile(std::function<void(std::optional<Common::NewUUID>)> callback) const override; |
| 23 | }; | 24 | }; |
| 24 | 25 | ||
| 25 | } // namespace Core::Frontend | 26 | } // namespace Core::Frontend |