mirror of
https://github.com/citra-emu/citra-nightly.git
synced 2024-12-23 09:55:35 +00:00
parent
0dd007e9ba
commit
da6a40e3d1
|
@ -67,10 +67,6 @@ System::ResultStatus System::SingleStep() {
|
||||||
}
|
}
|
||||||
|
|
||||||
System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& filepath) {
|
System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& filepath) {
|
||||||
if (app_loader) {
|
|
||||||
app_loader.reset();
|
|
||||||
}
|
|
||||||
|
|
||||||
app_loader = Loader::GetLoader(filepath);
|
app_loader = Loader::GetLoader(filepath);
|
||||||
|
|
||||||
if (!app_loader) {
|
if (!app_loader) {
|
||||||
|
@ -123,10 +119,6 @@ void System::Reschedule() {
|
||||||
}
|
}
|
||||||
|
|
||||||
System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
|
System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
|
||||||
if (cpu_core) {
|
|
||||||
cpu_core.reset();
|
|
||||||
}
|
|
||||||
|
|
||||||
Memory::Init();
|
Memory::Init();
|
||||||
|
|
||||||
if (Settings::values.use_cpu_jit) {
|
if (Settings::values.use_cpu_jit) {
|
||||||
|
@ -159,7 +151,8 @@ void System::Shutdown() {
|
||||||
Kernel::Shutdown();
|
Kernel::Shutdown();
|
||||||
HW::Shutdown();
|
HW::Shutdown();
|
||||||
CoreTiming::Shutdown();
|
CoreTiming::Shutdown();
|
||||||
cpu_core.reset();
|
cpu_core = nullptr;
|
||||||
|
app_loader = nullptr;
|
||||||
|
|
||||||
LOG_DEBUG(Core, "Shutdown OK");
|
LOG_DEBUG(Core, "Shutdown OK");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue