diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2015-12-28 10:02:53 +0100 |
|---|---|---|
| committer | Markus Wick <degasus@users.noreply.github.com> | 2015-12-28 10:02:53 +0100 |
| commit | cec1a759769bea2d7a224f99d6ee34ad9a602bed (patch) | |
| tree | a566f3c7d776924e7ea9ccfb6d88f3ccb3214e19 /Source/Core/DolphinWX/Debugger/RegisterView.cpp | |
| parent | 8843760ad72fa19d72c53607f27313c88ab864a1 (diff) | |
| parent | 4d3f05ddf85ff82398b47cdca40189c3f0ef0453 (diff) | |
Merge pull request #3296 from sepalani/r_menu
DebuggerViews: Fixed nullptr dereferences
Diffstat (limited to 'Source/Core/DolphinWX/Debugger/RegisterView.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/RegisterView.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Debugger/RegisterView.cpp b/Source/Core/DolphinWX/Debugger/RegisterView.cpp index 9f29b032ba..232e7774ef 100644 --- a/Source/Core/DolphinWX/Debugger/RegisterView.cpp +++ b/Source/Core/DolphinWX/Debugger/RegisterView.cpp @@ -273,7 +273,7 @@ void CRegisterView::OnMouseDownR(wxGridEvent& 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; CWatchWindow* watch_window = code_window->m_WatchWindow; CMemoryWindow* memory_window = code_window->m_MemoryWindow; |