summaryrefslogtreecommitdiffstats
path: root/src/core/frontend
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2022-02-05 18:29:09 +0100
committerMorph <39850852+Morph1984@users.noreply.github.com>2022-02-05 19:56:21 +0100
commitdfe11d72e3eb14dee718b7fa67a673514d199f20 (patch)
treef21885d513c2df4bb409e17016e0996815e37569 /src/core/frontend
parentcommon: uuid: Add AsU128() (diff)
downloadyuzu-dfe11d72e3eb14dee718b7fa67a673514d199f20.tar
yuzu-dfe11d72e3eb14dee718b7fa67a673514d199f20.tar.gz
yuzu-dfe11d72e3eb14dee718b7fa67a673514d199f20.tar.bz2
yuzu-dfe11d72e3eb14dee718b7fa67a673514d199f20.tar.lz
yuzu-dfe11d72e3eb14dee718b7fa67a673514d199f20.tar.xz
yuzu-dfe11d72e3eb14dee718b7fa67a673514d199f20.tar.zst
yuzu-dfe11d72e3eb14dee718b7fa67a673514d199f20.zip
Diffstat (limited to 'src/core/frontend')
-rw-r--r--src/core/frontend/applets/profile_select.cpp5
-rw-r--r--src/core/frontend/applets/profile_select.h7
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 {
ProfileSelectApplet::~ProfileSelectApplet() = default;
void DefaultProfileSelectApplet::SelectProfile(
- std::function<void(std::optional<Common::UUID>)> callback) const {
+ std::function<void(std::optional<Common::NewUUID>)> callback) const {
Service::Account::ProfileManager manager;
- callback(manager.GetUser(Settings::values.current_user.GetValue())
- .value_or(Common::UUID{Common::INVALID_UUID}));
+ callback(manager.GetUser(Settings::values.current_user.GetValue()).value_or(Common::NewUUID{}));
LOG_INFO(Service_ACC, "called, selecting current user instead of prompting...");
}
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 @@
#include <functional>
#include <optional>
-#include "common/uuid.h"
+#include "common/new_uuid.h"
namespace Core::Frontend {
@@ -14,12 +14,13 @@ class ProfileSelectApplet {
public:
virtual ~ProfileSelectApplet();
- virtual void SelectProfile(std::function<void(std::optional<Common::UUID>)> callback) const = 0;
+ virtual void SelectProfile(
+ std::function<void(std::optional<Common::NewUUID>)> callback) const = 0;
};
class DefaultProfileSelectApplet final : public ProfileSelectApplet {
public:
- void SelectProfile(std::function<void(std::optional<Common::UUID>)> callback) const override;
+ void SelectProfile(std::function<void(std::optional<Common::NewUUID>)> callback) const override;
};
} // namespace Core::Frontend