From 73b77489846989c8bccf9615ae75658d1ebc6f1d Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 20 Nov 2018 12:02:16 -0500 Subject: am/applets: Make the applet data broker part of the applet itself. The accessor should be doing just that, accessing, rather than retaining the lifetime of the data broker as well. --- src/core/hle/service/am/applets/applets.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/core/hle/service/am/applets/applets.cpp') diff --git a/src/core/hle/service/am/applets/applets.cpp b/src/core/hle/service/am/applets/applets.cpp index 8adb81823..becbadd06 100644 --- a/src/core/hle/service/am/applets/applets.cpp +++ b/src/core/hle/service/am/applets/applets.cpp @@ -98,10 +98,8 @@ Applet::Applet() = default; Applet::~Applet() = default; -void Applet::Initialize(std::shared_ptr broker_) { - broker = std::move(broker_); - - const auto common = broker->PopNormalDataToApplet(); +void Applet::Initialize() { + const auto common = broker.PopNormalDataToApplet(); ASSERT(common != nullptr); const auto common_data = common->GetData(); -- cgit v1.2.3