Merge pull request #3409 from sepalani/r_menu_code

RegisterView: View code menu added
dolphin-emu · Jan 2, 2016 · 066af14 · 066af14
2 parents 96d8ea5 + a696735
commit 066af14
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Source/Core/DolphinWX/Debugger/RegisterView.cpp b/Source/Core/DolphinWX/Debugger/RegisterView.cpp
@@ -27,6 +27,7 @@ enum
 {
 	IDM_WATCHADDRESS,
 	IDM_VIEWMEMORY,
+	IDM_VIEWCODE
 };
 
 static const char *special_reg_names[] = {
@@ -268,6 +269,7 @@ void CRegisterView::OnMouseDownR(wxGridEvent& event)
 	wxMenu menu;
 	menu.Append(IDM_WATCHADDRESS, _("Add to &watch"));
 	menu.Append(IDM_VIEWMEMORY, _("View &memory"));
+	menu.Append(IDM_VIEWCODE, _("View &code"));
 	PopupMenu(&menu);
 }
 
@@ -291,6 +293,10 @@ void CRegisterView::OnPopupMenu(wxCommandEvent& event)
 			memory_window->JumpToAddress(m_selectedAddress);
 		Refresh();
 		break;
+	case IDM_VIEWCODE:
+		code_window->JumpToAddress(m_selectedAddress);
+		Refresh();
+		break;
 	}
 	event.Skip();
 }