Merge pull request #8030 from spycrab/qt_patch_preview

Qt/Debugger: Implement patch instruction preview

1 files changed, 4 insertions, 8 deletions

diff --git a/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp b/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp
index 295902d264..71518a2dda 100644
--- a/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp
@@ -26,6 +26,7 @@
 #include "Core/PowerPC/PPCAnalyst.h"
 #include "Core/PowerPC/PPCSymbolDB.h"
 #include "Core/PowerPC/PowerPC.h"
+#include "DolphinQt/Debugger/PatchInstructionDialog.h"
 #include "DolphinQt/Resources.h"
 #include "DolphinQt/Settings.h"
 
@@ -463,17 +464,12 @@ void CodeViewWidget::OnReplaceInstruction()
   if (!read_result.valid)
     return;
 
-  bool good;
-  QString name = QInputDialog::getText(
-      this, tr("Change instruction"), tr("New instruction:"), QLineEdit::Normal,
-      QStringLiteral("%1").arg(read_result.hex, 8, 16, QLatin1Char('0')), &good);
-
-  u32 code = name.toUInt(&good, 16);
+  PatchInstructionDialog dialog(this, addr, PowerPC::debug_interface.ReadInstruction(addr));
 
-  if (good)
+  if (dialog.exec() == QDialog::Accepted)
   {
     PowerPC::debug_interface.UnsetPatch(addr);
-    PowerPC::debug_interface.SetPatch(addr, code);
+    PowerPC::debug_interface.SetPatch(addr, dialog.GetCode());
     Update();
   }
 }