summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-07-19 19:59:44 -0400
committerLioncash <mathew1800@gmail.com>2014-07-19 19:59:44 -0400
commit298425920a0e4ac3aa7da635336b8be39eb08788 (patch)
tree09ceb563d8f87860cd38d64eba4afc4d97eee00f /Source/Core/DolphinWX/Debugger/MemoryWindow.cpp
parent44e43fe5c30e66b9f28b41b405c39f300ae31627 (diff)
DolphinWX: Fix a possible crash when setting debugger memory values.
Diffstat (limited to 'Source/Core/DolphinWX/Debugger/MemoryWindow.cpp')
-rw-r--r--Source/Core/DolphinWX/Debugger/MemoryWindow.cpp6
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;