Merge pull request #1586 from lioncash/ar

DolphinWX: Fix button handling for AR codes and ISO patch removal.
dolphin-emu · Nov 22, 2014 · 60e9301 · 60e9301
2 parents f8879c8 + f73b6ab
commit 60e9301
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Source/Core/DolphinWX/ARCodeAddEdit.cpp b/Source/Core/DolphinWX/ARCodeAddEdit.cpp
@@ -33,7 +33,7 @@ CARCodeAddEdit::CARCodeAddEdit(int _selection, wxWindow* parent, wxWindowID id,
 	: wxDialog(parent, id, title, position, size, style)
 	, selection(_selection)
 {
-	Bind(wxEVT_BUTTON, &CARCodeAddEdit::SaveCheatData, this);
+	Bind(wxEVT_BUTTON, &CARCodeAddEdit::SaveCheatData, this, wxID_OK);
 
 	ActionReplay::ARCode tempEntries;
 	wxString currentName = _("Insert name here..");

diff --git a/Source/Core/DolphinWX/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties.cpp
@@ -1377,7 +1377,7 @@ void CISOProperties::PatchButtonClicked(wxCommandEvent& event)
 		break;
 	case ID_REMOVEPATCH:
 		onFrame.erase(onFrame.begin() + Patches->GetSelection());
-		Patches->Delete(Cheats->GetSelection());
+		Patches->Delete(Patches->GetSelection());
 		break;
 	}