diff options
| author | 2021-06-23 02:35:42 -0400 | |
|---|---|---|
| committer | 2021-06-23 02:35:42 -0400 | |
| commit | 20f474b09ab503607fab651342bcee433d117c80 (patch) | |
| tree | e9f506ad8d9a5366065dd83797813a504cbaba3e /src/yuzu_cmd/yuzu.cpp | |
| parent | Merge pull request #6514 from OZtistic/master (diff) | |
| parent | bootmanager: Use std::stop_source for stopping emulation (diff) | |
| download | yuzu-20f474b09ab503607fab651342bcee433d117c80.tar.gz yuzu-20f474b09ab503607fab651342bcee433d117c80.tar.xz yuzu-20f474b09ab503607fab651342bcee433d117c80.zip | |
Merge pull request #6508 from ReinUsesLisp/bootmanager-stop-token
bootmanager: Use std::stop_source for stopping emulation
Diffstat (limited to 'src/yuzu_cmd/yuzu.cpp')
| -rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index 584967f5c..50e388312 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp | |||
| @@ -219,7 +219,7 @@ int main(int argc, char** argv) { | |||
| 219 | system.GPU().Start(); | 219 | system.GPU().Start(); |
| 220 | 220 | ||
| 221 | system.Renderer().ReadRasterizer()->LoadDiskResources( | 221 | system.Renderer().ReadRasterizer()->LoadDiskResources( |
| 222 | system.CurrentProcess()->GetTitleID(), false, | 222 | system.CurrentProcess()->GetTitleID(), std::stop_token{}, |
| 223 | [](VideoCore::LoadCallbackStage, size_t value, size_t total) {}); | 223 | [](VideoCore::LoadCallbackStage, size_t value, size_t total) {}); |
| 224 | 224 | ||
| 225 | void(system.Run()); | 225 | void(system.Run()); |