aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/system.cpp
diff options
context:
space:
mode:
authorGravatar Subv <subv2112@gmail.com>2015-01-08 21:48:18 -0500
committerGravatar Subv <subv2112@gmail.com>2015-01-08 21:49:41 -0500
commit40c1439c34105300594abb4fad7ff3d1758bb221 (patch)
tree2eb72bb96e65660201520327c138485917f63c07 /src/core/system.cpp
parent0d0d6ef31a8a347a3660c5ff64639e6a9a65b331 (diff)
Core: Fixed a crash and removed some unused variables.
ARM_Disasm only has static methods, so there's no need to have an instance of it.
Diffstat (limited to 'src/core/system.cpp')
-rw-r--r--src/core/system.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/system.cpp b/src/core/system.cpp
index d6188f05..f4c2df1c 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();
}