From f4db168a8e63751535d174d27abe7dbab19d4d74 Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Tue, 30 Jul 2024 19:55:27 -0700 Subject: [PATCH] CheatsManager: Create ARCodeWidget and GeckoCodeWidget only once. Create ARCodeWidget and GeckoCodeWidget once on startup rather than every time a game is launched or shutdown. In addition to losing focus on the tab (since the previous widget and tab no longer existed), the behavior prior to this commit could cause a crash if the user initiated a game shutdown and then opened a code edit window since the AR/GeckoCodeWidget would get deleted in the meantime. --- Source/Core/DolphinQt/CheatsManager.cpp | 80 +++++++------------ Source/Core/DolphinQt/CheatsManager.h | 2 +- Source/Core/DolphinQt/Config/ARCodeWidget.cpp | 39 ++++++--- Source/Core/DolphinQt/Config/ARCodeWidget.h | 4 + .../Core/DolphinQt/Config/GeckoCodeWidget.cpp | 39 +++++++-- .../Core/DolphinQt/Config/GeckoCodeWidget.h | 4 + 6 files changed, 96 insertions(+), 72 deletions(-) diff --git a/Source/Core/DolphinQt/CheatsManager.cpp b/Source/Core/DolphinQt/CheatsManager.cpp index 53f051785c..cb17486d11 100644 --- a/Source/Core/DolphinQt/CheatsManager.cpp +++ b/Source/Core/DolphinQt/CheatsManager.cpp @@ -36,8 +36,6 @@ CheatsManager::CheatsManager(Core::System& system, QWidget* parent) CreateWidgets(); ConnectWidgets(); - RefreshCodeTabs(Core::GetState(m_system), true); - auto& settings = Settings::GetQSettings(); restoreGeometry(settings.value(QStringLiteral("cheatsmanager/geometry")).toByteArray()); } @@ -50,7 +48,7 @@ CheatsManager::~CheatsManager() void CheatsManager::OnStateChanged(Core::State state) { - RefreshCodeTabs(state, false); + RefreshCodeTabs(state); if (state == Core::State::Paused) UpdateAllCheatSearchWidgetCurrentValues(); } @@ -99,9 +97,9 @@ void CheatsManager::showEvent(QShowEvent* event) RegisterAfterFrameEventCallback(); } -void CheatsManager::RefreshCodeTabs(Core::State state, bool force) +void CheatsManager::RefreshCodeTabs(Core::State state) { - if (!force && (state == Core::State::Starting || state == Core::State::Stopping)) + if (state == Core::State::Starting || state == Core::State::Stopping) return; const auto& game_id = @@ -109,47 +107,15 @@ void CheatsManager::RefreshCodeTabs(Core::State state, bool force) const auto& game_tdb_id = SConfig::GetInstance().GetGameTDBID(); const u16 revision = SConfig::GetInstance().GetRevision(); - if (!force && m_game_id == game_id && m_game_tdb_id == game_tdb_id && m_revision == revision) + if (m_game_id == game_id && m_game_tdb_id == game_tdb_id && m_revision == revision) return; m_game_id = game_id; m_game_tdb_id = game_tdb_id; m_revision = revision; - if (m_ar_code) - { - const int tab_index = m_tab_widget->indexOf(m_ar_code); - if (tab_index != -1) - m_tab_widget->removeTab(tab_index); - m_ar_code->deleteLater(); - m_ar_code = nullptr; - } - - if (m_gecko_code) - { - const int tab_index = m_tab_widget->indexOf(m_gecko_code); - if (tab_index != -1) - m_tab_widget->removeTab(tab_index); - m_gecko_code->deleteLater(); - m_gecko_code = nullptr; - } - - m_ar_code = new ARCodeWidget(m_game_id, m_revision, false); - m_gecko_code = new GeckoCodeWidget(m_game_id, m_game_tdb_id, m_revision, false); - m_tab_widget->insertTab(0, m_ar_code, tr("AR Code")); - m_tab_widget->insertTab(1, m_gecko_code, tr("Gecko Codes")); - m_tab_widget->setTabUnclosable(0); - m_tab_widget->setTabUnclosable(1); - - connect(m_ar_code, &ARCodeWidget::OpenGeneralSettings, this, &CheatsManager::OpenGeneralSettings); - connect(m_gecko_code, &GeckoCodeWidget::OpenGeneralSettings, this, - &CheatsManager::OpenGeneralSettings); -#ifdef USE_RETRO_ACHIEVEMENTS - connect(m_ar_code, &ARCodeWidget::OpenAchievementSettings, this, - &CheatsManager::OpenAchievementSettings); - connect(m_gecko_code, &GeckoCodeWidget::OpenAchievementSettings, this, - &CheatsManager::OpenAchievementSettings); -#endif // USE_RETRO_ACHIEVEMENTS + m_ar_code->ChangeGame(m_game_id, m_revision); + m_gecko_code->ChangeGame(m_game_id, m_game_tdb_id, m_revision); } void CheatsManager::CreateWidgets() @@ -157,9 +123,19 @@ void CheatsManager::CreateWidgets() m_tab_widget = new PartiallyClosableTabWidget; m_button_box = new QDialogButtonBox(QDialogButtonBox::Close); + int tab_index; + + m_ar_code = new ARCodeWidget(m_game_id, m_revision, false); + tab_index = m_tab_widget->addTab(m_ar_code, tr("AR Code")); + m_tab_widget->setTabUnclosable(tab_index); + + m_gecko_code = new GeckoCodeWidget(m_game_id, m_game_tdb_id, m_revision, false); + tab_index = m_tab_widget->addTab(m_gecko_code, tr("Gecko Codes")); + m_tab_widget->setTabUnclosable(tab_index); + m_cheat_search_new = new CheatSearchFactoryWidget(); - m_tab_widget->addTab(m_cheat_search_new, tr("Start New Cheat Search")); - m_tab_widget->setTabUnclosable(0); + tab_index = m_tab_widget->addTab(m_cheat_search_new, tr("Start New Cheat Search")); + m_tab_widget->setTabUnclosable(tab_index); auto* layout = new QVBoxLayout; layout->addWidget(m_tab_widget); @@ -172,14 +148,9 @@ void CheatsManager::OnNewSessionCreated(const Cheats::CheatSearchSessionBase& se { auto* w = new CheatSearchWidget(m_system, session.Clone()); const int tab_index = m_tab_widget->addTab(w, tr("Cheat Search")); - w->connect(w, &CheatSearchWidget::ActionReplayCodeGenerated, this, - [this](const ActionReplay::ARCode& ar_code) { - if (m_ar_code) - m_ar_code->AddCode(ar_code); - }); - w->connect(w, &CheatSearchWidget::ShowMemory, [this](u32 address) { emit ShowMemory(address); }); - w->connect(w, &CheatSearchWidget::RequestWatch, - [this](QString name, u32 address) { emit RequestWatch(name, address); }); + connect(w, &CheatSearchWidget::ActionReplayCodeGenerated, m_ar_code, &ARCodeWidget::AddCode); + connect(w, &CheatSearchWidget::ShowMemory, this, &CheatsManager::ShowMemory); + connect(w, &CheatSearchWidget::RequestWatch, this, &CheatsManager::RequestWatch); m_tab_widget->setCurrentIndex(tab_index); } @@ -196,4 +167,13 @@ void CheatsManager::ConnectWidgets() connect(m_cheat_search_new, &CheatSearchFactoryWidget::NewSessionCreated, this, &CheatsManager::OnNewSessionCreated); connect(m_tab_widget, &QTabWidget::tabCloseRequested, this, &CheatsManager::OnTabCloseRequested); + connect(m_ar_code, &ARCodeWidget::OpenGeneralSettings, this, &CheatsManager::OpenGeneralSettings); + connect(m_gecko_code, &GeckoCodeWidget::OpenGeneralSettings, this, + &CheatsManager::OpenGeneralSettings); +#ifdef USE_RETRO_ACHIEVEMENTS + connect(m_ar_code, &ARCodeWidget::OpenAchievementSettings, this, + &CheatsManager::OpenAchievementSettings); + connect(m_gecko_code, &GeckoCodeWidget::OpenAchievementSettings, this, + &CheatsManager::OpenAchievementSettings); +#endif // USE_RETRO_ACHIEVEMENTS } diff --git a/Source/Core/DolphinQt/CheatsManager.h b/Source/Core/DolphinQt/CheatsManager.h index 783a79ef45..708cc4095f 100644 --- a/Source/Core/DolphinQt/CheatsManager.h +++ b/Source/Core/DolphinQt/CheatsManager.h @@ -58,7 +58,7 @@ private: void OnNewSessionCreated(const Cheats::CheatSearchSessionBase& session); void OnTabCloseRequested(int index); - void RefreshCodeTabs(Core::State state, bool force); + void RefreshCodeTabs(Core::State state); void UpdateAllCheatSearchWidgetCurrentValues(); std::string m_game_id; diff --git a/Source/Core/DolphinQt/Config/ARCodeWidget.cpp b/Source/Core/DolphinQt/Config/ARCodeWidget.cpp index 82a5dce74b..a305786f68 100644 --- a/Source/Core/DolphinQt/Config/ARCodeWidget.cpp +++ b/Source/Core/DolphinQt/Config/ARCodeWidget.cpp @@ -40,6 +40,22 @@ ARCodeWidget::ARCodeWidget(std::string game_id, u16 game_revision, bool restart_ ARCodeWidget::~ARCodeWidget() = default; +void ARCodeWidget::ChangeGame(std::string game_id, const u16 game_revision) +{ + m_game_id = std::move(game_id); + m_game_revision = game_revision; + m_restart_required = false; + + m_ar_codes.clear(); + + // If a CheatCodeEditor is open, it's now trying to add or edit a code in the previous game's code + // list which is no longer loaded. Letting the user save the code wouldn't make sense, so close + // the dialog instead. + m_cheat_code_editor->reject(); + + LoadCodes(); +} + void ARCodeWidget::CreateWidgets() { m_warning = new CheatWarningWidget(m_game_id, m_restart_required, this); @@ -51,6 +67,8 @@ void ARCodeWidget::CreateWidgets() m_code_edit = new NonDefaultQPushButton(tr("&Edit Code...")); m_code_remove = new NonDefaultQPushButton(tr("&Remove Code")); + m_cheat_code_editor = new CheatCodeEditor(this); + m_code_list->setContextMenuPolicy(Qt::CustomContextMenu); auto* button_layout = new QHBoxLayout; @@ -250,10 +268,9 @@ void ARCodeWidget::OnCodeAddClicked() ActionReplay::ARCode ar; ar.enabled = true; - CheatCodeEditor ed(this); - ed.SetARCode(&ar); - SetQWidgetWindowDecorations(&ed); - if (ed.exec() == QDialog::Rejected) + m_cheat_code_editor->SetARCode(&ar); + SetQWidgetWindowDecorations(m_cheat_code_editor); + if (m_cheat_code_editor->exec() == QDialog::Rejected) return; m_ar_codes.push_back(std::move(ar)); @@ -270,23 +287,19 @@ void ARCodeWidget::OnCodeEditClicked() const auto* const selected = items[0]; auto& current_ar = m_ar_codes[m_code_list->row(selected)]; + SetQWidgetWindowDecorations(m_cheat_code_editor); - CheatCodeEditor ed(this); if (current_ar.user_defined) { - ed.SetARCode(¤t_ar); - - SetQWidgetWindowDecorations(&ed); - if (ed.exec() == QDialog::Rejected) + m_cheat_code_editor->SetARCode(¤t_ar); + if (m_cheat_code_editor->exec() == QDialog::Rejected) return; } else { ActionReplay::ARCode ar = current_ar; - ed.SetARCode(&ar); - - SetQWidgetWindowDecorations(&ed); - if (ed.exec() == QDialog::Rejected) + m_cheat_code_editor->SetARCode(&ar); + if (m_cheat_code_editor->exec() == QDialog::Rejected) return; m_ar_codes.push_back(std::move(ar)); diff --git a/Source/Core/DolphinQt/Config/ARCodeWidget.h b/Source/Core/DolphinQt/Config/ARCodeWidget.h index 765744632f..94fb8ebbe5 100644 --- a/Source/Core/DolphinQt/Config/ARCodeWidget.h +++ b/Source/Core/DolphinQt/Config/ARCodeWidget.h @@ -15,6 +15,7 @@ namespace ActionReplay struct ARCode; } +class CheatCodeEditor; class CheatWarningWidget; #ifdef USE_RETRO_ACHIEVEMENTS class HardcoreWarningWidget; @@ -31,6 +32,7 @@ public: explicit ARCodeWidget(std::string game_id, u16 game_revision, bool restart_required = true); ~ARCodeWidget() override; + void ChangeGame(std::string game_id, u16 game_revision); void AddCode(ActionReplay::ARCode code); signals: @@ -71,6 +73,8 @@ private: QPushButton* m_code_edit; QPushButton* m_code_remove; + CheatCodeEditor* m_cheat_code_editor; + std::vector m_ar_codes; bool m_restart_required; }; diff --git a/Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp b/Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp index 08db0c1648..0fc875401c 100644 --- a/Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp +++ b/Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp @@ -45,6 +45,29 @@ GeckoCodeWidget::GeckoCodeWidget(std::string game_id, std::string gametdb_id, u1 LoadCodes(); } +void GeckoCodeWidget::ChangeGame(std::string game_id, std::string gametdb_id, + const u16 game_revision) +{ + m_game_id = std::move(game_id); + m_gametdb_id = std::move(gametdb_id); + m_game_revision = game_revision; + m_restart_required = false; + + m_gecko_codes.clear(); + m_code_list->clear(); + m_name_label->clear(); + m_creator_label->clear(); + m_code_description->clear(); + m_code_view->clear(); + + // If a CheatCodeEditor is open, it's now trying to add or edit a code in the previous game's code + // list which is no longer loaded. Letting the user save the code wouldn't make sense, so close + // the dialog instead. + m_cheat_code_editor->reject(); + + LoadCodes(); +} + GeckoCodeWidget::~GeckoCodeWidget() = default; void GeckoCodeWidget::CreateWidgets() @@ -78,6 +101,8 @@ void GeckoCodeWidget::CreateWidgets() m_remove_code = new NonDefaultQPushButton(tr("&Remove Code")); m_download_codes = new NonDefaultQPushButton(tr("Download Codes")); + m_cheat_code_editor = new CheatCodeEditor(this); + m_download_codes->setToolTip(tr("Download Codes from the WiiRD Database")); auto* layout = new QVBoxLayout; @@ -187,10 +212,9 @@ void GeckoCodeWidget::AddCode() Gecko::GeckoCode code; code.enabled = true; - CheatCodeEditor ed(this); - ed.SetGeckoCode(&code); - SetQWidgetWindowDecorations(&ed); - if (ed.exec() == QDialog::Rejected) + m_cheat_code_editor->SetGeckoCode(&code); + SetQWidgetWindowDecorations(m_cheat_code_editor); + if (m_cheat_code_editor->exec() == QDialog::Rejected) return; m_gecko_codes.push_back(std::move(code)); @@ -206,10 +230,9 @@ void GeckoCodeWidget::EditCode() const int index = item->data(Qt::UserRole).toInt(); - CheatCodeEditor ed(this); - ed.SetGeckoCode(&m_gecko_codes[index]); - SetQWidgetWindowDecorations(&ed); - if (ed.exec() == QDialog::Rejected) + m_cheat_code_editor->SetGeckoCode(&m_gecko_codes[index]); + SetQWidgetWindowDecorations(m_cheat_code_editor); + if (m_cheat_code_editor->exec() == QDialog::Rejected) return; SaveCodes(); diff --git a/Source/Core/DolphinQt/Config/GeckoCodeWidget.h b/Source/Core/DolphinQt/Config/GeckoCodeWidget.h index b387129890..a490a9f3db 100644 --- a/Source/Core/DolphinQt/Config/GeckoCodeWidget.h +++ b/Source/Core/DolphinQt/Config/GeckoCodeWidget.h @@ -10,6 +10,7 @@ #include "Common/CommonTypes.h" +class CheatCodeEditor; class CheatWarningWidget; #ifdef USE_RETRO_ACHIEVEMENTS class HardcoreWarningWidget; @@ -33,6 +34,8 @@ public: bool restart_required = true); ~GeckoCodeWidget() override; + void ChangeGame(std::string game_id, std::string gametdb_id, u16 game_revision); + signals: void OpenGeneralSettings(); #ifdef USE_RETRO_ACHIEVEMENTS @@ -75,6 +78,7 @@ private: QPushButton* m_edit_code; QPushButton* m_remove_code; QPushButton* m_download_codes; + CheatCodeEditor* m_cheat_code_editor; std::vector m_gecko_codes; bool m_restart_required; };