summaryrefslogtreecommitdiffstats
path: root/src/citra_qt
diff options
context:
space:
mode:
authorMathieu Vaillancourt <vaillancourtm@gmail.com>2014-04-01 04:42:19 +0200
committerMathieu Vaillancourt <vaillancourtm@gmail.com>2014-04-01 04:42:19 +0200
commit81b61ee720341b507ef6c88d560b6250a38f8916 (patch)
tree93439ef61e07c672a79332d3728c28c55235c0a9 /src/citra_qt
parentBasic QT window (diff)
downloadyuzu-81b61ee720341b507ef6c88d560b6250a38f8916.tar
yuzu-81b61ee720341b507ef6c88d560b6250a38f8916.tar.gz
yuzu-81b61ee720341b507ef6c88d560b6250a38f8916.tar.bz2
yuzu-81b61ee720341b507ef6c88d560b6250a38f8916.tar.lz
yuzu-81b61ee720341b507ef6c88d560b6250a38f8916.tar.xz
yuzu-81b61ee720341b507ef6c88d560b6250a38f8916.tar.zst
yuzu-81b61ee720341b507ef6c88d560b6250a38f8916.zip
Diffstat (limited to 'src/citra_qt')
-rw-r--r--src/citra_qt/src/bootmanager.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/citra_qt/src/bootmanager.cpp b/src/citra_qt/src/bootmanager.cpp
index 8d7b5e446..cda618778 100644
--- a/src/citra_qt/src/bootmanager.cpp
+++ b/src/citra_qt/src/bootmanager.cpp
@@ -5,6 +5,7 @@
#include "bootmanager.hxx"
#include "core.h"
+#include "loader.h"
#include "version.h"
@@ -35,20 +36,19 @@ void EmuThread::run()
}
// 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());
+ }
+
Core::Start(); //autoboot for now
- /*
- if (E_OK == dvd::LoadBootableFile(filename)) {
- if (common::g_config->enable_auto_boot()) {
- core::Start();
- } else {
- LOG_ERROR(TMASTER, "Autoboot required in no-GUI mode... Exiting!\n");
- }
- } else {
- LOG_ERROR(TMASTER, "Failed to load a bootable file... Exiting!\n");
- exit(E_ERR);
- }
- */
+ for (int tight_loop = 0; tight_loop < 10000; ++tight_loop) {
+ Core::SingleStep();
+ }
/*
while(core::SYS_DIE != core::g_state)
{