Merge pull request #3275 from MerryMage/shutdown-before-init

core: Don't Shutdown before we've even Init-ed
2017-12-11 18:50:16 -07:00 · 2017-12-11 18:50:16 -07:00 · b88ed528a3
parent ae7240a2cb 533feb42d1
commit b88ed528a3
1 changed files with 0 additions and 1 deletions
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@ -87,7 +87,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: