summaryrefslogtreecommitdiffstats
path: root/src/citra
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/citra/citra.cpp12
-rw-r--r--src/citra_qt/bootmanager.cpp3
2 files changed, 8 insertions, 7 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index d55b97393..6f3bc6f84 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -18,26 +18,24 @@
int __cdecl main(int argc, char **argv) {
std::string program_dir = File::GetCurrentDir();
- LogManager::Init();
+ LogManager::Init();
EmuWindow_GLFW* emu_window = new EmuWindow_GLFW;
- System::Init(emu_window);
+ System::Init(emu_window);
std::string boot_filename = "homebrew.elf";
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());
}
- for (;;) {
- Core::SingleStep();
- }
+ Core::RunLoop();
delete emu_window;
- return 0;
+ return 0;
}
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 31958ac28..cf9e1bffc 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -6,6 +6,8 @@
#include "core/core.h"
#include "core/loader.h"
+#include "core/hw/hw.h"
+
#include "video_core/video_core.h"
#include "version.h"
@@ -40,6 +42,7 @@ void EmuThread::run()
emit CPUStepped();
}
}
+ HW::Update();
}
Core::Stop();