diff options
| author | JMC47 <JMC4789@gmail.com> | 2025-05-14 17:14:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-14 17:14:47 -0400 |
| commit | 5a355083b497273b558cd9a66ba582802d7f2856 (patch) | |
| tree | bea6d2144fae15e9b713bedddd27a5acb275225c /Source/Core/DolphinQt/MainWindow.cpp | |
| parent | 059282df6f5a0f1671611fbd72de645916b526cd (diff) | |
| parent | 826f04d06c89011fa7e47531111ee90b27344c8a (diff) | |
Merge pull request #13659 from jordan-woyak/ra-deadlock-fix
RetroAchievements: Fix potential deadlock on shutdown.
Diffstat (limited to 'Source/Core/DolphinQt/MainWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/MainWindow.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index 99d38e4d6d..7ed9a3948c 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -274,7 +274,9 @@ MainWindow::MainWindow(Core::System& system, std::unique_ptr<BootParameters> boo NetPlayInit(); #ifdef USE_RETRO_ACHIEVEMENTS - AchievementManager::GetInstance().Init(reinterpret_cast<void*>(winId())); + AchievementManager::GetInstance().Init(reinterpret_cast<void*>(winId()), [this](auto func) { + QueueOnObject(this, std::move(func)); + }); if (AchievementManager::GetInstance().IsHardcoreModeActive()) Settings::Instance().SetDebugModeEnabled(false); // This needs to trigger on both RA_HARDCORE_ENABLED and RA_ENABLED |