Common: Make HookableEvent use non-static data.
Co-authored-by: Dentomologist <[email protected]>
This commit is contained in:
co-authored by
Dentomologist
parent
9c28f19e56
commit
f289b06e0d
@@ -31,7 +31,7 @@ AchievementsWindow::AchievementsWindow(QWidget* parent) : QDialog(parent)
|
||||
CreateMainLayout();
|
||||
ConnectWidgets();
|
||||
|
||||
m_event_hook = AchievementManager::UpdateEvent::Register(
|
||||
m_event_hook = AchievementManager::GetInstance().update_event.Register(
|
||||
[this](AchievementManager::UpdatedItems updated_items) {
|
||||
QueueOnObject(this, [this, updated_items = std::move(updated_items)] {
|
||||
AchievementsWindow::UpdateData(std::move(updated_items));
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
#include "Core/CheatSearch.h"
|
||||
#include "Core/ConfigManager.h"
|
||||
#include "Core/Core.h"
|
||||
#include "Core/System.h"
|
||||
|
||||
#include "DolphinQt/QtUtils/QtUtils.h"
|
||||
#include "DolphinQt/QtUtils/WrapInScrollArea.h"
|
||||
@@ -78,7 +79,8 @@ void CheatsManager::UpdateAllCheatSearchWidgetCurrentValues()
|
||||
|
||||
void CheatsManager::RegisterAfterFrameEventCallback()
|
||||
{
|
||||
m_VI_end_field_event = VIEndFieldEvent::Register([this] { OnFrameEnd(); }, "CheatsManager");
|
||||
m_VI_end_field_event = m_system.GetVideoEvents().vi_end_field_event.Register(
|
||||
[this] { OnFrameEnd(); }, "CheatsManager");
|
||||
}
|
||||
|
||||
void CheatsManager::RemoveAfterFrameEventCallback()
|
||||
|
||||
@@ -429,7 +429,8 @@ void MemoryWidget::hideEvent(QHideEvent* event)
|
||||
|
||||
void MemoryWidget::RegisterAfterFrameEventCallback()
|
||||
{
|
||||
m_vi_end_field_event = VIEndFieldEvent::Register([this] { AutoUpdateTable(); }, "MemoryWidget");
|
||||
m_vi_end_field_event = m_system.GetVideoEvents().vi_end_field_event.Register(
|
||||
[this] { AutoUpdateTable(); }, "MemoryWidget");
|
||||
}
|
||||
|
||||
void MemoryWidget::RemoveAfterFrameEventCallback()
|
||||
|
||||
@@ -295,7 +295,7 @@ void MenuBar::AddToolsMenu()
|
||||
tools_menu->addAction(tr("Achievements"), this, [this] { emit ShowAchievementsWindow(); });
|
||||
#ifdef RC_CLIENT_SUPPORTS_RAINTEGRATION
|
||||
m_achievements_dev_menu = tools_menu->addMenu(tr("RetroAchievements Development"));
|
||||
m_raintegration_event_hook = AchievementManager::DevMenuUpdateEvent::Register(
|
||||
m_raintegration_event_hook = AchievementManager::GetInstance().dev_menu_update_event.Register(
|
||||
[this] { QueueOnObject(this, [this] { UpdateAchievementDevelopmentMenu(); }); }, "MenuBar");
|
||||
m_achievements_dev_menu->menuAction()->setVisible(false);
|
||||
#endif // RC_CLIENT_SUPPORTS_RAINTEGRATION
|
||||
|
||||
Reference in New Issue
Block a user