summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-01-20 23:11:10 -0500
committerGitHub <noreply@github.com>2018-01-20 23:11:10 -0500
commitd904b0db588ac4683ec846d584bccba979c441dd (patch)
tree3947276431be9220cec3d9b52bfac031d61ea2ad
parentdefaaf4519dd0beea5886c03b9a7a0bd348e2eb4 (diff)
parent30d2ba9de3df28914f368e5d4ee1cf7272e1c46b (diff)
Merge pull request #72 from N00byKing/patch-2
Implement Pull #3275 from citra: core: Don't Shutdown before we've even Init-ed
-rw-r--r--src/core/core.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 0ba44b111..dc21e4f04 100644
--- 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: