diff options
| author | bunnei <bunneidev@gmail.com> | 2015-04-27 22:12:35 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-05-01 18:27:03 -0400 |
| commit | c7dc799e193d1ced47b21465f2e664908ae32ebc (patch) | |
| tree | ceed823c1eeb6ca3abe248786b2e72538cd380c3 /src/core/hle/kernel/kernel.cpp | |
| parent | 57aaaf92dbbdb4c1d43f6b564c7e8f83ab0811e7 (diff) | |
Kernel: Properly initialize and shutdown all modules.
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 6261b82b6f..fca582bbee 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 |