Merge pull request #72 from N00byKing/patch-2

Implement Pull #3275 from citra: core: Don't Shutdown before we've even Init-ed
2018-01-20 23:11:10 -05:00 · 2018-01-20 23:11:10 -05:00 · d904b0db58
parent defaaf4519 30d2ba9de3
commit d904b0db58
1 changed files with 0 additions and 1 deletions
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@ -82,7 +82,6 @@ System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& file
    if (system_mode.second != Loader::ResultStatus::Success) {
        LOG_CRITICAL(Core, "Failed to determine system mode (Error %i)!",
                     static_cast<int>(system_mode.second));
-        System::Shutdown();

        switch (system_mode.second) {
        case Loader::ResultStatus::ErrorEncrypted: