diff options
| author |  bunnei | 2018-01-20 23:11:10 -0500 |
|---|---|---|
| committer |  GitHub | 2018-01-20 23:11:10 -0500 |
| commit | d904b0db588ac4683ec846d584bccba979c441dd (patch) | |
| tree | 3947276431be9220cec3d9b52bfac031d61ea2ad | |
| parent | Merge pull request #92 from gdkchan/nro_refactor (diff) | |
| parent | Update core.cpp (diff) | |
| download | yuzu-d904b0db588ac4683ec846d584bccba979c441dd.tar.gz yuzu-d904b0db588ac4683ec846d584bccba979c441dd.tar.xz yuzu-d904b0db588ac4683ec846d584bccba979c441dd.zip | |
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.cpp | 1 |
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 | |||
| 82 | if (system_mode.second != Loader::ResultStatus::Success) { | 82 | if (system_mode.second != Loader::ResultStatus::Success) { |
| 83 | LOG_CRITICAL(Core, "Failed to determine system mode (Error %i)!", | 83 | LOG_CRITICAL(Core, "Failed to determine system mode (Error %i)!", |
| 84 | static_cast<int>(system_mode.second)); | 84 | static_cast<int>(system_mode.second)); |
| 85 | System::Shutdown(); | ||
| 86 | 85 | ||
| 87 | switch (system_mode.second) { | 86 | switch (system_mode.second) { |
| 88 | case Loader::ResultStatus::ErrorEncrypted: | 87 | case Loader::ResultStatus::ErrorEncrypted: |