summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2021-04-02 17:59:04 -0700
committerGravatar bunnei2021-05-05 16:40:50 -0700
commitd9df63583fb3d64512a70ceb3a4b66390c044e98 (patch)
tree9acc74f6cd50c4ff40daff990c92782744d3cc7b /src
parentcore: memory: Add a work-around to allocate and access kernel memory regions ... (diff)
downloadyuzu-d9df63583fb3d64512a70ceb3a4b66390c044e98.tar.gz
yuzu-d9df63583fb3d64512a70ceb3a4b66390c044e98.tar.xz
yuzu-d9df63583fb3d64512a70ceb3a4b66390c044e98.zip
core: Defer CoreTiming initialization.
Diffstat (limited to 'src')
-rw-r--r--src/core/core.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 66500a0d4..fdaa82c8f 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -166,9 +166,9 @@ struct System::Impl {
166 cpu_manager.SetAsyncGpu(is_async_gpu); 166 cpu_manager.SetAsyncGpu(is_async_gpu);
167 core_timing.SetMulticore(is_multicore); 167 core_timing.SetMulticore(is_multicore);
168 168
169 core_timing.Initialize([&system]() { system.RegisterHostThread(); });
170 kernel.Initialize(); 169 kernel.Initialize();
171 cpu_manager.Initialize(); 170 cpu_manager.Initialize();
171 core_timing.Initialize([&system]() { system.RegisterHostThread(); });
172 172
173 const auto current_time = std::chrono::duration_cast<std::chrono::seconds>( 173 const auto current_time = std::chrono::duration_cast<std::chrono::seconds>(
174 std::chrono::system_clock::now().time_since_epoch()); 174 std::chrono::system_clock::now().time_since_epoch());