diff options
author | bunnei <bunneidev@gmail.com> | 2014-06-25 15:46:14 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2014-06-25 15:46:14 +0200 |
commit | 469fe42fad01fc45e454e6acfa413eeae92e587e (patch) | |
tree | 4cf876688cc2d03d34512f8f1a25bc26d853f1fb /src/citra_qt | |
parent | Merge pull request #7 from archshift/travis-osx (diff) | |
parent | Loader: Refactored loading functions to only read data from binary if called. (diff) | |
download | yuzu-469fe42fad01fc45e454e6acfa413eeae92e587e.tar yuzu-469fe42fad01fc45e454e6acfa413eeae92e587e.tar.gz yuzu-469fe42fad01fc45e454e6acfa413eeae92e587e.tar.bz2 yuzu-469fe42fad01fc45e454e6acfa413eeae92e587e.tar.lz yuzu-469fe42fad01fc45e454e6acfa413eeae92e587e.tar.xz yuzu-469fe42fad01fc45e454e6acfa413eeae92e587e.tar.zst yuzu-469fe42fad01fc45e454e6acfa413eeae92e587e.zip |
Diffstat (limited to '')
-rw-r--r-- | src/citra_qt/bootmanager.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/main.cpp | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index f85116419..421b2af55 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -5,7 +5,7 @@ #include "bootmanager.hxx" #include "core/core.h" -#include "core/loader.h" +#include "core/loader/loader.h" #include "core/hw/hw.h" #include "video_core/video_core.h" diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 087716c01..0bcce7d16 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -23,9 +23,10 @@ #include "debugger/graphics_cmdlists.hxx" #include "core/system.h" -#include "core/loader.h" #include "core/core.h" +#include "core/loader/loader.h" #include "core/arm/disassembler/load_symbol_map.h" + #include "version.h" @@ -134,11 +135,8 @@ void GMainWindow::BootGame(const char* filename) // Load a game or die... std::string boot_filename = filename; - std::string error_str; - bool res = Loader::LoadFile(boot_filename, &error_str); - - if (!res) { - ERROR_LOG(BOOT, "Failed to load ROM: %s", error_str.c_str()); + if (Loader::ResultStatus::Success != Loader::LoadFile(boot_filename)) { + ERROR_LOG(BOOT, "Failed to load ROM!"); } disasmWidget->Init(); |