diff options
author | bunnei <bunneidev@gmail.com> | 2015-05-01 19:05:18 -0400 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-05-01 19:05:18 -0400 |
commit | 6a2d8c46f21e8813e0472dba28932ed461ce1a66 (patch) | |
tree | d7057cf9926c822c12cc7d82814a252db79ca600 /src/core/hle/kernel/kernel.cpp | |
parent | 4d30edc11effef4021a7bd7d5dfe1d92678708b9 (diff) | |
parent | 046dd6e3ef3f4b4da2dd2eef0bdfe0f6fb28b1d8 (diff) |
Merge pull request #713 from bunnei/qt-emuthread-fixes
Fix emulation state resetting to support multiple emulation sessions
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
-rw-r--r-- | src/core/hle/kernel/kernel.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 6261b82b..fca582bb 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -14,11 +14,10 @@ namespace Kernel { -unsigned int Object::next_object_id = 0; - -SharedPtr<Thread> g_main_thread = nullptr; +unsigned int Object::next_object_id; +SharedPtr<Thread> g_main_thread; HandleTable g_handle_table; -u64 g_program_id = 0; +u64 g_program_id; void WaitObject::AddWaitingThread(SharedPtr<Thread> thread) { auto itr = std::find(waiting_threads.begin(), waiting_threads.end(), thread); @@ -138,6 +137,10 @@ void HandleTable::Clear() { void Init() { Kernel::ThreadingInit(); Kernel::TimersInit(); + + Object::next_object_id = 0; + g_program_id = 0; + g_main_thread = nullptr; } /// Shutdown the kernel |