diff options
| author | Sepalani <sepalani@hotmail.fr> | 2015-11-28 22:38:53 +0100 |
|---|---|---|
| committer | Sepalani <sepalani@hotmail.fr> | 2015-12-27 19:57:58 +0400 |
| commit | 4d3f05ddf85ff82398b47cdca40189c3f0ef0453 (patch) | |
| tree | 9d1ebc588d9ba584d7843d07c0b2b6d926744b25 /Source/Core | |
| parent | 97cd723492941005690e8ddcac53e58d7e795f10 (diff) | |
DebuggerViews: Fixed nullptr dereferences
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/MemoryView.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/RegisterView.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/WatchView.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Debugger/MemoryView.cpp index 812c1a8eda..0fcd5a069f 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryView.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryView.cpp @@ -156,7 +156,7 @@ void CMemoryView::OnScrollWheel(wxMouseEvent& 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; CWatchWindow* watch_window = code_window->m_WatchWindow; 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; diff --git a/Source/Core/DolphinWX/Debugger/WatchView.cpp b/Source/Core/DolphinWX/Debugger/WatchView.cpp index be5c5dad64..ea79573f12 100644 --- a/Source/Core/DolphinWX/Debugger/WatchView.cpp +++ b/Source/Core/DolphinWX/Debugger/WatchView.cpp @@ -261,7 +261,7 @@ void CWatchView::OnMouseDownR(wxGridEvent& 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; CWatchWindow* watch_window = code_window->m_WatchWindow; CMemoryWindow* memory_window = code_window->m_MemoryWindow; |