piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3296 from sepalani/r_menu

Browse Source 
DebuggerViews: Fixed nullptr dereferences
This commit is contained in:
Markus Wick
2015-12-28 10:02:53 +01:00
parent 8843760ad7 4d3f05ddf8
commit cec1a75976
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Debugger/MemoryView.cpp
View File

@ -156,7 +156,7 @@ void CMemoryView::OnScrollWheel(wxMouseEvent& event)
void CMemoryView::OnPopupMenu(wxCommandEvent& event) void CMemoryView::OnPopupMenu(wxCommandEvent& event)
{ {
CFrame* main_frame = (CFrame*)(GetParent()->GetParent()->GetParent()); CFrame* main_frame = static_cast<CFrame*>(GetGrandParent()->GetParent());
CCodeWindow* code_window = main_frame->g_pCodeWindow; CCodeWindow* code_window = main_frame->g_pCodeWindow;
CWatchWindow* watch_window = code_window->m_WatchWindow; CWatchWindow* watch_window = code_window->m_WatchWindow;

2
Source/Core/DolphinWX/Debugger/RegisterView.cpp
View File

@ -273,7 +273,7 @@ void CRegisterView::OnMouseDownR(wxGridEvent& event)
void CRegisterView::OnPopupMenu(wxCommandEvent& event) void CRegisterView::OnPopupMenu(wxCommandEvent& event)
{ {
CFrame* main_frame = (CFrame*)(GetParent()->GetParent()); CFrame* main_frame = static_cast<CFrame*>(GetGrandParent()->GetParent());
CCodeWindow* code_window = main_frame->g_pCodeWindow; CCodeWindow* code_window = main_frame->g_pCodeWindow;
CWatchWindow* watch_window = code_window->m_WatchWindow; CWatchWindow* watch_window = code_window->m_WatchWindow;
CMemoryWindow* memory_window = code_window->m_MemoryWindow; CMemoryWindow* memory_window = code_window->m_MemoryWindow;

2
Source/Core/DolphinWX/Debugger/WatchView.cpp
View File

@ -261,7 +261,7 @@ void CWatchView::OnMouseDownR(wxGridEvent& event)
void CWatchView::OnPopupMenu(wxCommandEvent& event) void CWatchView::OnPopupMenu(wxCommandEvent& event)
{ {
CFrame* main_frame = (CFrame*)(GetParent()->GetParent()); CFrame* main_frame = static_cast<CFrame*>(GetGrandParent()->GetParent());
CCodeWindow* code_window = main_frame->g_pCodeWindow; CCodeWindow* code_window = main_frame->g_pCodeWindow;
CWatchWindow* watch_window = code_window->m_WatchWindow; CWatchWindow* watch_window = code_window->m_WatchWindow;
CMemoryWindow* memory_window = code_window->m_MemoryWindow; CMemoryWindow* memory_window = code_window->m_MemoryWindow;