From 0ae9f06376829b3f207f8b6f6a458bc42e114ebd Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Mon, 18 Aug 2014 07:49:34 -0700
Subject: [PATCH] Skip emuhacks when showing encodings in debugger.

This can cause confusion when it doesn't match the displayed disasm.
---
 Windows/Debugger/CtrlDisAsmView.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Windows/Debugger/CtrlDisAsmView.cpp b/Windows/Debugger/CtrlDisAsmView.cpp
index fc8de5a76d..04629fbd1b 100644
--- a/Windows/Debugger/CtrlDisAsmView.cpp
+++ b/Windows/Debugger/CtrlDisAsmView.cpp
@@ -230,10 +230,11 @@ bool CtrlDisAsmView::getDisasmAddressText(u32 address, char* dest, bool abbrevia
 			return false;
 		}
 	} else {
-		if (showData)
-			sprintf(dest,"%08X %08X",address,Memory::Read_U32(address));
-		else
-			sprintf(dest,"%08X",address);
+		if (showData) {
+			sprintf(dest, "%08X %08X", address, Memory::Read_Instruction(address, true).encoding);
+		} else {
+			sprintf(dest, "%08X", address);
+		}
 		return false;
 	}
 }