From 436be6022218a1bce01f2c4e9416cbb1a6a1b773 Mon Sep 17 00:00:00 2001
From: Morilli <35152647+Morilli@users.noreply.github.com>
Date: Sun, 25 Aug 2024 21:04:28 +0200
Subject: [PATCH] cleanup and fix GenericDebugger.DecrementCurrentAddress

---
 .../Debugger/GenericDebugger.Disassembler.cs  | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
index e3c8b1f97e..7d483be0a3 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
@@ -102,14 +102,9 @@ namespace BizHawk.Client.EmuHawk
 
 		private void DecrementCurrentAddress()
 		{
-			if (_currentDisassemblerAddress == 0)
-			{
-				return;
-			}
-
 			uint newaddress = _currentDisassemblerAddress;
-			
-			while (true)
+
+			while (newaddress != 0)
 			{
 				Disassembler.Disassemble(MemoryDomains.SystemBus, newaddress, out var bytestoadvance);
 				if (newaddress + bytestoadvance == _currentDisassemblerAddress)
@@ -117,20 +112,14 @@ namespace BizHawk.Client.EmuHawk
 					break;
 				}
 
-				newaddress--;
-
-				if (newaddress < 0)
-				{
-					newaddress = 0;
-					break;
-				}
-
 				// Just in case
 				if (_currentDisassemblerAddress - newaddress > 5)
 				{
 					newaddress = _currentDisassemblerAddress - 1;
 					break;
 				}
+
+				newaddress--;
 			}
 
 			_currentDisassemblerAddress = newaddress;