aboutsummaryrefslogtreecommitdiff
path: root/src/core/core.cpp
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
commit4f20190c95a98a765b6c865cd9ccb8f82215d6fc (patch)
tree3947276431be9220cec3d9b52bfac031d61ea2ad /src/core/core.cpp
parentf1f6d730a58c1b1340e2817c865f92f54b42195a (diff)
parentcdcfc192581aa8f99405c238adbe165ffdaa93b3 (diff)
Merge pull request #72 from N00byKing/patch-2
Implement Pull #3275 from citra: core: Don't Shutdown before we've even Init-ed
Diffstat (limited to 'src/core/core.cpp')
-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 0ba44b1113..dc21e4f040 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: