citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

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

core: Don't Shutdown before we've even Init-ed
This commit is contained in:
James Rowe 2017-12-11 18:50:16 -07:00 committed by GitHub
parent ae7240a2cb 533feb42d1
commit b88ed528a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/core.cpp
View File

@ -87,7 +87,6 @@ System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& file
if (system_mode.second != Loader::ResultStatus::Success) { if (system_mode.second != Loader::ResultStatus::Success) {
LOG_CRITICAL(Core, "Failed to determine system mode (Error %i)!", LOG_CRITICAL(Core, "Failed to determine system mode (Error %i)!",
static_cast<int>(system_mode.second)); static_cast<int>(system_mode.second));
System::Shutdown();
switch (system_mode.second) { switch (system_mode.second) {
case Loader::ResultStatus::ErrorEncrypted: case Loader::ResultStatus::ErrorEncrypted: