From 04969f94b69710f6ca88642d8c930947f2094eb0 Mon Sep 17 00:00:00 2001 From: Roland Munsil Date: Mon, 24 Sep 2018 21:34:48 -0500 Subject: [PATCH 1/2] Fix some Cheat Manager comparisons being wrong --- Source/Core/DolphinQt/CheatsManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/DolphinQt/CheatsManager.cpp b/Source/Core/DolphinQt/CheatsManager.cpp index 3fbdbd4076..6f4c586f27 100644 --- a/Source/Core/DolphinQt/CheatsManager.cpp +++ b/Source/Core/DolphinQt/CheatsManager.cpp @@ -397,11 +397,11 @@ static bool Compare(T mem_value, T value, CompareType op) case CompareType::Less: return mem_value < value; case CompareType::LessEqual: - return mem_value <= mem_value; + return mem_value <= value; case CompareType::More: - return value > mem_value; + return mem_value > value; case CompareType::MoreEqual: - return value >= mem_value; + return mem_value >= value; default: return false; } From 54bd16e7531dc7683bd39ebf2212393a4cdca2e3 Mon Sep 17 00:00:00 2001 From: Roland Munsil Date: Mon, 24 Sep 2018 23:01:24 -0500 Subject: [PATCH 2/2] Fix typo causing "Remove from Watch" in Cheat Manager to crash Dolphin --- Source/Core/DolphinQt/CheatsManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinQt/CheatsManager.cpp b/Source/Core/DolphinQt/CheatsManager.cpp index 6f4c586f27..2565b6437b 100644 --- a/Source/Core/DolphinQt/CheatsManager.cpp +++ b/Source/Core/DolphinQt/CheatsManager.cpp @@ -163,7 +163,7 @@ void CheatsManager::OnWatchContextMenu() QMenu* menu = new QMenu(this); menu->addAction(tr("Remove from Watch"), this, [this] { - auto* item = m_match_table->selectedItems()[0]; + auto* item = m_watch_table->selectedItems()[0]; int index = item->data(INDEX_ROLE).toInt();