From 7c481d179c2984c0a1ea19e67ab87ab5938b6e18 Mon Sep 17 00:00:00 2001 From: "sl1nk3.s" Date: Fri, 11 Dec 2009 00:03:56 +0000 Subject: [PATCH] Fix a crash reported in r4671, plus a fix related to issue 1523 i forgot a month ago >.> git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4677 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 2 +- Source/Core/DolphinWX/Src/ISOProperties.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index c5618d179f..16ca736246 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -721,7 +721,7 @@ void CGameListCtrl::OnMouseMotion(wxMouseEvent& event) { if (subitem == COLUMN_EMULATION_STATE) { - if (toolTip || lastItem == item) { + if (toolTip || lastItem == item || this != FindFocus()) { event.Skip(); return; } diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index fcf908db3e..9e0d2ce656 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -1049,6 +1049,7 @@ void CISOProperties::PatchButtonClicked(wxCommandEvent& event) break; case ID_REMOVEPATCH: onFrame.erase(onFrame.begin() + Patches->GetSelection()); + Patches->Delete(Cheats->GetSelection()); break; }