summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/kernel.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-05-02 01:05:18 +0200
committerbunnei <bunneidev@gmail.com>2015-05-02 01:05:18 +0200
commit6a2d8c46f21e8813e0472dba28932ed461ce1a66 (patch)
treed7057cf9926c822c12cc7d82814a252db79ca600 /src/core/hle/kernel/kernel.cpp
parentMerge pull request #717 from linkmauve/useless-auto (diff)
parentQt: Shutdown game on emulator close event. (diff)
downloadyuzu-6a2d8c46f21e8813e0472dba28932ed461ce1a66.tar
yuzu-6a2d8c46f21e8813e0472dba28932ed461ce1a66.tar.gz
yuzu-6a2d8c46f21e8813e0472dba28932ed461ce1a66.tar.bz2
yuzu-6a2d8c46f21e8813e0472dba28932ed461ce1a66.tar.lz
yuzu-6a2d8c46f21e8813e0472dba28932ed461ce1a66.tar.xz
yuzu-6a2d8c46f21e8813e0472dba28932ed461ce1a66.tar.zst
yuzu-6a2d8c46f21e8813e0472dba28932ed461ce1a66.zip
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
-rw-r--r--src/core/hle/kernel/kernel.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 6261b82b6..fca582bbe 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