diff options
| author | 2019-03-20 21:33:05 -0400 | |
|---|---|---|
| committer | 2019-03-20 21:33:05 -0400 | |
| commit | c1409602da10b8e2ddd80e72a894f208e32e4b9f (patch) | |
| tree | ec97d662eec8e4245950bfe0668c5c17ba87485f | |
| parent | Merge pull request #2264 from lioncash/linker (diff) | |
| parent | frontend: qt: fix a freeze where if you click on entry in the game list too f... (diff) | |
| download | yuzu-c1409602da10b8e2ddd80e72a894f208e32e4b9f.tar.gz yuzu-c1409602da10b8e2ddd80e72a894f208e32e4b9f.tar.xz yuzu-c1409602da10b8e2ddd80e72a894f208e32e4b9f.zip | |
Merge pull request #2239 from FearlessTobi/port-4684
Port citra-emu/citra#4684: "frontend: qt: fix a freeze where if you click on entry in the game list too fast, citra will hang"
| -rw-r--r-- | src/yuzu/bootmanager.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index d2c97b1f8..05ad19e1d 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp | |||
| @@ -24,8 +24,6 @@ void EmuThread::run() { | |||
| 24 | 24 | ||
| 25 | MicroProfileOnThreadCreate("EmuThread"); | 25 | MicroProfileOnThreadCreate("EmuThread"); |
| 26 | 26 | ||
| 27 | stop_run = false; | ||
| 28 | |||
| 29 | emit LoadProgress(VideoCore::LoadCallbackStage::Prepare, 0, 0); | 27 | emit LoadProgress(VideoCore::LoadCallbackStage::Prepare, 0, 0); |
| 30 | 28 | ||
| 31 | Core::System::GetInstance().Renderer().Rasterizer().LoadDiskResources( | 29 | Core::System::GetInstance().Renderer().Rasterizer().LoadDiskResources( |
| @@ -40,7 +38,7 @@ void EmuThread::run() { | |||
| 40 | render_window->DoneCurrent(); | 38 | render_window->DoneCurrent(); |
| 41 | } | 39 | } |
| 42 | 40 | ||
| 43 | // holds whether the cpu was running during the last iteration, | 41 | // Holds whether the cpu was running during the last iteration, |
| 44 | // so that the DebugModeLeft signal can be emitted before the | 42 | // so that the DebugModeLeft signal can be emitted before the |
| 45 | // next execution step | 43 | // next execution step |
| 46 | bool was_active = false; | 44 | bool was_active = false; |