piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13675 from LillyJadeKatrin/retroachievements-close-deadlock

Browse Source 
AchievementManager - LoadGameCallback
This commit is contained in:
JMC47
2025-05-20 11:54:31 -04:00
committed by GitHub
parent faaf13eaad dac023af15
commit 1dc4dc6b6d
4 changed files with 31 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/DolphinQt/Achievements/AchievementSettingsWidget.cpp
View File

@ -6,12 +6,13 @@
#include <QLabel>
#include <QLineEdit>
#include <QPushButton>
#include <QString>
#include <QVBoxLayout>
#include "Core/AchievementManager.h"
#include "Core/Config/AchievementSettings.h"
#include "Core/Config/FreeLookSettings.h"
#include "Core/Config/MainSettings.h"
#include "Core/Config/UISettings.h"
#include "Core/Core.h"
#include "Core/Movie.h"
@ -21,7 +22,7 @@
#include "DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.h"
#include "DolphinQt/Config/ToolTipControls/ToolTipCheckBox.h"
#include "DolphinQt/QtUtils/ModalMessageBox.h"
#include "DolphinQt/QtUtils/QueueOnObject.h"
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
#include "DolphinQt/QtUtils/SignalBlocking.h"
#include "DolphinQt/Settings.h"
@ -251,14 +252,9 @@ void AchievementSettingsWidget::ToggleRAIntegration()
auto& instance = AchievementManager::GetInstance();
if (Config::Get(Config::RA_ENABLED))
{
instance.Init(reinterpret_cast<void*>(winId()),
[this](auto func) { QueueOnObject(this, std::move(func)); });
}
instance.Init(reinterpret_cast<void*>(winId()));
else
{
instance.Shutdown();
}
}
void AchievementSettingsWidget::Login()

4
Source/Core/DolphinQt/MainWindow.cpp
View File

@ -274,9 +274,7 @@ MainWindow::MainWindow(Core::System& system, std::unique_ptr<BootParameters> boo
NetPlayInit();
#ifdef USE_RETRO_ACHIEVEMENTS
AchievementManager::GetInstance().Init(reinterpret_cast<void*>(winId()), [this](auto func) {
QueueOnObject(this, std::move(func));
});
AchievementManager::GetInstance().Init(reinterpret_cast<void*>(winId()));
if (AchievementManager::GetInstance().IsHardcoreModeActive())
Settings::Instance().SetDebugModeEnabled(false);
// This needs to trigger on both RA_HARDCORE_ENABLED and RA_ENABLED