summaryrefslogtreecommitdiff
path: root/src/citra_qt/bootmanager.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2014-08-20 13:27:05 -0400
committerGravatar bunnei2014-08-20 13:27:05 -0400
commit23867647561d9f17b96972b5a44461f7c2ab2a94 (patch)
tree36d84928c9cb5b5fe8693406509aea351a593777 /src/citra_qt/bootmanager.cpp
parentMerge pull request #60 from xsacha/qt5 (diff)
parentRevert "Removed redundant loop in EmuThread::run()" (diff)
downloadyuzu-23867647561d9f17b96972b5a44461f7c2ab2a94.tar.gz
yuzu-23867647561d9f17b96972b5a44461f7c2ab2a94.tar.xz
yuzu-23867647561d9f17b96972b5a44461f7c2ab2a94.zip
Merge pull request #62 from archshift/revert-49-redundantloop
Revert "Removed redundant loop in EmuThread::run()"
Diffstat (limited to 'src/citra_qt/bootmanager.cpp')
-rw-r--r--src/citra_qt/bootmanager.cpp17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 250df59f8..b0aa1e561 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -32,14 +32,17 @@ void EmuThread::run()
32{ 32{
33 while (true) 33 while (true)
34 { 34 {
35 if (cpu_running || exec_cpu_step) 35 for (int tight_loop = 0; tight_loop < 10000; ++tight_loop)
36 { 36 {
37 if (exec_cpu_step) 37 if (cpu_running || exec_cpu_step)
38 exec_cpu_step = false; 38 {
39 39 if (exec_cpu_step)
40 Core::SingleStep(); 40 exec_cpu_step = false;
41 if (!cpu_running) 41
42 emit CPUStepped(); 42 Core::SingleStep();
43 if (!cpu_running)
44 emit CPUStepped();
45 }
43 } 46 }
44 } 47 }
45 48