Merge pull request #1 from Djihads80/yumekiru/ns2-progress-v2

Experimental NS2 support and accumulated GPU fixes

1 files changed, 6 insertions, 6 deletions

diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 4f1d849209..c7beb9c3ce 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -120,13 +120,13 @@ struct KernelCore::Impl {
     }
 
     void TerminateAllProcesses() {
-        std::scoped_lock lk{process_list_lock};
-        for (auto& process : process_list) {
-            process->Terminate(system.Kernel());
-            process->Close(system.Kernel());
-            process = nullptr;
+        auto& kernel = system.Kernel();
+        // Applet cleanup can remove processes while termination waits for its threads.
+        auto processes = kernel.GetProcessList();
+        for (auto& process : processes) {
+            process->Terminate(kernel);
+            kernel.RemoveProcess(process.GetPointerUnsafe());
         }
-        process_list.clear();
     }
 
     void Shutdown(KernelCore& kernel) {