diff options
| author | 2015-01-08 21:48:18 -0500 | |
|---|---|---|
| committer | 2015-01-08 21:49:41 -0500 | |
| commit | 40c1439c34105300594abb4fad7ff3d1758bb221 (patch) | |
| tree | 2eb72bb96e65660201520327c138485917f63c07 /src/core/system.cpp | |
| parent | Merge pull request #450 from Subv/ticks_fix (diff) | |
| download | yuzu-40c1439c34105300594abb4fad7ff3d1758bb221.tar.gz yuzu-40c1439c34105300594abb4fad7ff3d1758bb221.tar.xz yuzu-40c1439c34105300594abb4fad7ff3d1758bb221.zip | |
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.cpp | 4 |
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) { | |||
| 21 | 21 | ||
| 22 | void Init(EmuWindow* emu_window) { | 22 | void Init(EmuWindow* emu_window) { |
| 23 | Core::Init(); | 23 | Core::Init(); |
| 24 | CoreTiming::Init(); | ||
| 24 | Memory::Init(); | 25 | Memory::Init(); |
| 25 | HW::Init(); | 26 | HW::Init(); |
| 26 | Kernel::Init(); | 27 | Kernel::Init(); |
| 27 | HLE::Init(); | 28 | HLE::Init(); |
| 28 | CoreTiming::Init(); | ||
| 29 | VideoCore::Init(emu_window); | 29 | VideoCore::Init(emu_window); |
| 30 | } | 30 | } |
| 31 | 31 | ||
| @@ -38,11 +38,11 @@ void RunLoopUntil(u64 global_cycles) { | |||
| 38 | 38 | ||
| 39 | void Shutdown() { | 39 | void Shutdown() { |
| 40 | VideoCore::Shutdown(); | 40 | VideoCore::Shutdown(); |
| 41 | CoreTiming::Shutdown(); | ||
| 42 | HLE::Shutdown(); | 41 | HLE::Shutdown(); |
| 43 | Kernel::Shutdown(); | 42 | Kernel::Shutdown(); |
| 44 | HW::Shutdown(); | 43 | HW::Shutdown(); |
| 45 | Memory::Shutdown(); | 44 | Memory::Shutdown(); |
| 45 | CoreTiming::Shutdown(); | ||
| 46 | Core::Shutdown(); | 46 | Core::Shutdown(); |
| 47 | } | 47 | } |
| 48 | 48 | ||