diff options
| author | bunnei <bunneidev@gmail.com> | 2020-11-24 14:31:58 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-24 14:31:58 -0800 |
| commit | 7791cc8c2e585dcc377e22a26f548db914250a5d (patch) | |
| tree | 81273d60fee9da0146317881711b6f0b43650355 /src/core/hle/service/am/am.h | |
| parent | fbda5e9ec93fad65c86afd2c20695100651cd6e6 (diff) | |
hle: services: Fix a crash with improper NVFlinger lifetime management. (#4977)
* hle: services: Fix a crash with improper NVFlinger lifetime management.
- This crash would happen when attempting to shutdown yuzu early on in boot.
Diffstat (limited to 'src/core/hle/service/am/am.h')
| -rw-r--r-- | src/core/hle/service/am/am.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.h index bcc06affe..09c2d05bc 100644 --- a/src/core/hle/service/am/am.h +++ b/src/core/hle/service/am/am.h @@ -121,8 +121,7 @@ public: class ISelfController final : public ServiceFramework<ISelfController> { public: - explicit ISelfController(Core::System& system_, - std::shared_ptr<NVFlinger::NVFlinger> nvflinger_); + explicit ISelfController(Core::System& system_, NVFlinger::NVFlinger& nvflinger_); ~ISelfController() override; private: @@ -156,7 +155,7 @@ private: }; Core::System& system; - std::shared_ptr<NVFlinger::NVFlinger> nvflinger; + NVFlinger::NVFlinger& nvflinger; Kernel::EventPair launchable_event; Kernel::EventPair accumulated_suspended_tick_changed_event; @@ -332,7 +331,7 @@ public: }; /// Registers all AM services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& service_manager, - std::shared_ptr<NVFlinger::NVFlinger> nvflinger, Core::System& system); +void InstallInterfaces(SM::ServiceManager& service_manager, NVFlinger::NVFlinger& nvflinger, + Core::System& system); } // namespace Service::AM |
