diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-08-03 21:27:27 -0700 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-08-03 21:27:27 -0700 |
| commit | 497de04c529e6a47fb9f781de7ad1d6d89814160 (patch) | |
| tree | 72d766a1e9f5b48c8b6d91fbe2697d11b81fe58e /Source/Core/DolphinWX/Debugger/MemoryWindow.cpp | |
| parent | 95a8c24841f21954e27bd3d85d3cdf59bf8db23c (diff) | |
| parent | 0ed29e1fac94db18451a233e252976b4201bae24 (diff) | |
Merge pull request #671 from lioncash/non-panic
DolphinWX: Use a regular wxMessageBox instead of a PanicAlert for non-panic errors.
Diffstat (limited to 'Source/Core/DolphinWX/Debugger/MemoryWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/MemoryWindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp index 0640142422..fd3b036a94 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp @@ -162,7 +162,7 @@ void CMemoryWindow::SetMemoryValue(wxCommandEvent& event) { if (!Memory::IsInitialized()) { - PanicAlertT("Cannot set uninitialized memory."); + WxUtils::ShowErrorDialog(_("Cannot set uninitialized memory.")); return; } @@ -173,13 +173,13 @@ void CMemoryWindow::SetMemoryValue(wxCommandEvent& event) if (!TryParse(std::string("0x") + str_addr, &addr)) { - PanicAlertT("Invalid Address: %s", str_addr.c_str()); + WxUtils::ShowErrorDialog(wxString::Format(_("Invalid address: %s"), str_addr.c_str())); return; } if (!TryParse(std::string("0x") + str_val, &val)) { - PanicAlertT("Invalid Value: %s", str_val.c_str()); + WxUtils::ShowErrorDialog(wxString::Format(_("Invalid value: %s"), str_val.c_str())); return; } |
