diff options
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/k_server_session.h | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/k_thread.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/core/hle/kernel/k_server_session.h b/src/core/hle/kernel/k_server_session.h index 32135473b..188aef4af 100644 --- a/src/core/hle/kernel/k_server_session.h +++ b/src/core/hle/kernel/k_server_session.h @@ -91,7 +91,7 @@ private: /// List of threads which are pending a reply. boost::intrusive::list<KSessionRequest> m_request_list; - KSessionRequest* m_current_request; + KSessionRequest* m_current_request{}; KLightLock m_lock; }; diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp index d57b42fdf..cc88d08f0 100644 --- a/src/core/hle/kernel/k_thread.cpp +++ b/src/core/hle/kernel/k_thread.cpp @@ -1185,8 +1185,10 @@ void KThread::RequestDummyThreadWait() { } void KThread::DummyThreadBeginWait() { - ASSERT(this->IsDummyThread()); - ASSERT(!kernel.IsPhantomModeForSingleCore()); + if (!this->IsDummyThread() || kernel.IsPhantomModeForSingleCore()) { + // Occurs in single core mode. + return; + } // Block until runnable is no longer false. dummy_thread_runnable.wait(false); |
