summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2020-02-25 15:30:23 +0100
committerFernando Sahmkow <fsahmkow27@gmail.com>2020-06-27 17:35:07 +0200
commit9e4b9f1afdb93bab7640e9d04cc2e28b9c48a288 (patch)
treeae85a887e1f4d60ba4fe26213448c91714b4f378 /src
parentGeneral: Recover Prometheus project from harddrive failure (diff)
downloadyuzu-9e4b9f1afdb93bab7640e9d04cc2e28b9c48a288.tar
yuzu-9e4b9f1afdb93bab7640e9d04cc2e28b9c48a288.tar.gz
yuzu-9e4b9f1afdb93bab7640e9d04cc2e28b9c48a288.tar.bz2
yuzu-9e4b9f1afdb93bab7640e9d04cc2e28b9c48a288.tar.lz
yuzu-9e4b9f1afdb93bab7640e9d04cc2e28b9c48a288.tar.xz
yuzu-9e4b9f1afdb93bab7640e9d04cc2e28b9c48a288.tar.zst
yuzu-9e4b9f1afdb93bab7640e9d04cc2e28b9c48a288.zip
Diffstat (limited to '')
-rw-r--r--src/yuzu_cmd/yuzu.cpp7
-rw-r--r--src/yuzu_tester/yuzu.cpp7
2 files changed, 8 insertions, 6 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp
index 1e5377840..38ffdfbd3 100644
--- a/src/yuzu_cmd/yuzu.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -236,9 +236,10 @@ int main(int argc, char** argv) {
system.Renderer().Rasterizer().LoadDiskResources();
std::thread render_thread([&emu_window] { emu_window->Present(); });
- while (emu_window->IsOpen()) {
- //system.RunLoop();
- }
+ system.Run();
+ while (emu_window->IsOpen())
+ ;
+ system.Pause();
render_thread.join();
system.Shutdown();
diff --git a/src/yuzu_tester/yuzu.cpp b/src/yuzu_tester/yuzu.cpp
index 1a45506d4..d62686dd2 100644
--- a/src/yuzu_tester/yuzu.cpp
+++ b/src/yuzu_tester/yuzu.cpp
@@ -255,9 +255,10 @@ int main(int argc, char** argv) {
system.GPU().Start();
system.Renderer().Rasterizer().LoadDiskResources();
- while (!finished) {
- //system.RunLoop();
- }
+ system.Run();
+ while (!finished)
+ ;
+ system.Pause();
detached_tasks.WaitForAllTasks();
return return_value;