Merge pull request #451 from Subv/wut

Core: Fixed a crash and removed some unused variables.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/core/system.cpp b/src/core/system.cpp
index d6188f055..f4c2df1cd 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -21,11 +21,11 @@ void UpdateState(State state) {
 
 void Init(EmuWindow* emu_window) {
     Core::Init();
+    CoreTiming::Init();
     Memory::Init();
     HW::Init();
     Kernel::Init();
     HLE::Init();
-    CoreTiming::Init();
     VideoCore::Init(emu_window);
 }
 
@@ -38,11 +38,11 @@ void RunLoopUntil(u64 global_cycles) {
 
 void Shutdown() {
     VideoCore::Shutdown();
-    CoreTiming::Shutdown();
     HLE::Shutdown();
     Kernel::Shutdown();
     HW::Shutdown();
     Memory::Shutdown();
+    CoreTiming::Shutdown();
     Core::Shutdown();
 }