summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Fernando Sahmkow2020-02-25 10:30:23 -0400
committerGravatar Fernando Sahmkow2020-06-27 11:35:07 -0400
commit9e4b9f1afdb93bab7640e9d04cc2e28b9c48a288 (patch)
treeae85a887e1f4d60ba4fe26213448c91714b4f378 /src
parentGeneral: Recover Prometheus project from harddrive failure (diff)
downloadyuzu-9e4b9f1afdb93bab7640e9d04cc2e28b9c48a288.tar.gz
yuzu-9e4b9f1afdb93bab7640e9d04cc2e28b9c48a288.tar.xz
yuzu-9e4b9f1afdb93bab7640e9d04cc2e28b9c48a288.zip
YuzuCMD/Tester: Correct execution
Diffstat (limited to 'src')
-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) {
236 system.Renderer().Rasterizer().LoadDiskResources(); 236 system.Renderer().Rasterizer().LoadDiskResources();
237 237
238 std::thread render_thread([&emu_window] { emu_window->Present(); }); 238 std::thread render_thread([&emu_window] { emu_window->Present(); });
239 while (emu_window->IsOpen()) { 239 system.Run();
240 //system.RunLoop(); 240 while (emu_window->IsOpen())
241 } 241 ;
242 system.Pause();
242 render_thread.join(); 243 render_thread.join();
243 244
244 system.Shutdown(); 245 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) {
255 system.GPU().Start(); 255 system.GPU().Start();
256 system.Renderer().Rasterizer().LoadDiskResources(); 256 system.Renderer().Rasterizer().LoadDiskResources();
257 257
258 while (!finished) { 258 system.Run();
259 //system.RunLoop(); 259 while (!finished)
260 } 260 ;
261 system.Pause();
261 262
262 detached_tasks.WaitForAllTasks(); 263 detached_tasks.WaitForAllTasks();
263 return return_value; 264 return return_value;