diff options
| author | bunnei <bunneidev@gmail.com> | 2021-06-09 01:43:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-09 01:43:55 +0200 |
| commit | 3c621d37f0477046b489ab809f4b4a563f982510 (patch) | |
| tree | c6d6c48fc36d18990edd3fe70b8621e70c1c6cbb /src/core/hle/kernel/hle_ipc.h | |
| parent | Merge pull request #6426 from lat9nq/context-menu-start (diff) | |
| parent | hle: kernel: KServerSession: Work-around scenario where session is closed too early. (diff) | |
| download | yuzu-3c621d37f0477046b489ab809f4b4a563f982510.tar yuzu-3c621d37f0477046b489ab809f4b4a563f982510.tar.gz yuzu-3c621d37f0477046b489ab809f4b4a563f982510.tar.bz2 yuzu-3c621d37f0477046b489ab809f4b4a563f982510.tar.lz yuzu-3c621d37f0477046b489ab809f4b4a563f982510.tar.xz yuzu-3c621d37f0477046b489ab809f4b4a563f982510.tar.zst yuzu-3c621d37f0477046b489ab809f4b4a563f982510.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/kernel/hle_ipc.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h index 2aaf93fca..a61870f8b 100644 --- a/src/core/hle/kernel/hle_ipc.h +++ b/src/core/hle/kernel/hle_ipc.h @@ -85,8 +85,8 @@ public: */ void ClientDisconnected(KServerSession* session); - std::shared_ptr<ServiceThread> GetServiceThread() const { - return service_thread.lock(); + std::weak_ptr<ServiceThread> GetServiceThread() const { + return service_thread; } protected: @@ -152,10 +152,12 @@ public: session_handler = std::move(handler); } - std::shared_ptr<ServiceThread> GetServiceThread() const { + std::weak_ptr<ServiceThread> GetServiceThread() const { return session_handler->GetServiceThread(); } + bool HasSessionRequestHandler(const HLERequestContext& context) const; + private: bool is_domain{}; SessionRequestHandlerPtr session_handler; @@ -163,7 +165,6 @@ private: private: KernelCore& kernel; - std::weak_ptr<ServiceThread> service_thread; }; /** |