diff options
| author | Matthew Parlane <parlane@gmail.com> | 2014-07-23 21:24:03 +1200 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2014-07-23 21:24:03 +1200 |
| commit | 008b907bf0ffd7a48a0035bbc8663c827e07d7b9 (patch) | |
| tree | 06a987b2d6f46c86f95eb566999433d23b385cf7 /Source/Core/DolphinWX/Debugger/MemoryWindow.cpp | |
| parent | 257d2a6fafc1572d74285412b33a965b9dc095fe (diff) | |
| parent | 298425920a0e4ac3aa7da635336b8be39eb08788 (diff) | |
Merge pull request #655 from lioncash/crashes
Fix two possible crashes related to the debugger.
Diffstat (limited to 'Source/Core/DolphinWX/Debugger/MemoryWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/MemoryWindow.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp index 8621cb6f5b..0640142422 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp @@ -160,6 +160,12 @@ void CMemoryWindow::JumpToAddress(u32 _Address) void CMemoryWindow::SetMemoryValue(wxCommandEvent& event) { + if (!Memory::IsInitialized()) + { + PanicAlertT("Cannot set uninitialized memory."); + return; + } + std::string str_addr = WxStrToStr(addrbox->GetValue()); std::string str_val = WxStrToStr(valbox->GetValue()); u32 addr; |