summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/scheduler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/hle/kernel/scheduler.cpp')
-rw-r--r--src/core/hle/kernel/scheduler.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/hle/kernel/scheduler.cpp b/src/core/hle/kernel/scheduler.cpp
index 74d3731fc..d7529360c 100644
--- a/src/core/hle/kernel/scheduler.cpp
+++ b/src/core/hle/kernel/scheduler.cpp
@@ -689,10 +689,12 @@ void Scheduler::SwitchToCurrent() {
current_thread = selected_thread;
guard.unlock();
while (!is_context_switch_pending) {
- current_thread->context_guard.lock();
- if (current_thread->GetSchedulingStatus() != ThreadSchedStatus::Runnable) {
- current_thread->context_guard.unlock();
- break;
+ if (current_thread != nullptr) {
+ current_thread->context_guard.lock();
+ if (current_thread->GetSchedulingStatus() != ThreadSchedStatus::Runnable) {
+ current_thread->context_guard.unlock();
+ break;
+ }
}
std::shared_ptr<Common::Fiber> next_context;
if (current_thread != nullptr) {