hipnosuer
/
Zuma
forked from ShuriZma/suyu
1
0
Fork 0
Code Pull Requests Activity

Load file in qt window

This commit is contained in:
Mathieu Vaillancourt 2014-03-31 22:42:19 -04:00
parent 05be8d2f0c
commit 81b61ee720
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/citra_qt/src/bootmanager.cpp
View File

@ -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...
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);
}
*/
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
for (int tight_loop = 0; tight_loop < 10000; ++tight_loop) {
Core::SingleStep();
}
/*
while(core::SYS_DIE != core::g_state)
{