diff options
| author |  Mai M | 2021-06-22 22:20:14 -0400 |
|---|---|---|
| committer |  GitHub | 2021-06-22 22:20:14 -0400 |
| commit | d6b51e5e2182eeda581135f4c282469885a9e984 (patch) | |
| tree | 7bee9af13999732a0a9c1194707d39b6bc493156 /src/common/detached_tasks.cpp | |
| parent | Merge pull request #6509 from ReinUsesLisp/mouse-datarace (diff) | |
| parent | common/detached_tasks: Wait for tasks before shutting down (diff) | |
| download | yuzu-d6b51e5e2182eeda581135f4c282469885a9e984.tar.gz yuzu-d6b51e5e2182eeda581135f4c282469885a9e984.tar.xz yuzu-d6b51e5e2182eeda581135f4c282469885a9e984.zip | |
Merge pull request #6512 from ReinUsesLisp/wait-detached-stasks
common/detached_tasks: Wait for tasks before shutting down
Diffstat (limited to 'src/common/detached_tasks.cpp')
| -rw-r--r-- | src/common/detached_tasks.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/detached_tasks.cpp b/src/common/detached_tasks.cpp index f2b4939df..c1362631e 100644 --- a/src/common/detached_tasks.cpp +++ b/src/common/detached_tasks.cpp | |||
| @@ -21,6 +21,8 @@ void DetachedTasks::WaitForAllTasks() { | |||
| 21 | } | 21 | } |
| 22 | 22 | ||
| 23 | DetachedTasks::~DetachedTasks() { | 23 | DetachedTasks::~DetachedTasks() { |
| 24 | WaitForAllTasks(); | ||
| 25 | |||
| 24 | std::unique_lock lock{mutex}; | 26 | std::unique_lock lock{mutex}; |
| 25 | ASSERT(count == 0); | 27 | ASSERT(count == 0); |
| 26 | instance = nullptr; | 28 | instance = nullptr; |