Scheduler: Fix HLE Threads on guard

master
Fernando Sahmkow 2020-03-06 20:36:05 +07:00
parent 3de33348e4
commit 6ed28e15fa
1 changed files with 6 additions and 4 deletions

@ -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) {