From 6b11a2e870f88ea27cdb395761bf71936600c5d2 Mon Sep 17 00:00:00 2001
From: alex-botw <101593696+alex-botw@users.noreply.github.com>
Date: Tue, 9 Dec 2025 14:07:37 +0300
Subject: [PATCH 1/2] Update HardwareBreakpoints.cpp

---
 plugins/HardwareBreakpoints/HardwareBreakpoints.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/HardwareBreakpoints/HardwareBreakpoints.cpp b/plugins/HardwareBreakpoints/HardwareBreakpoints.cpp
index cab58a23e..727db2a4a 100644
--- a/plugins/HardwareBreakpoints/HardwareBreakpoints.cpp
+++ b/plugins/HardwareBreakpoints/HardwareBreakpoints.cpp
@@ -165,7 +165,7 @@ void HardwareBreakpoints::setupBreakpoints() {
 				thread->getState(&state);
 
 				for (int i = 0; i < RegisterCount; ++i) {
-					if (ok[i]) {
+					if (edb::v1::eval_expression(addresses_[i]->text(), &addr[i])) {
 						set_breakpoint_state(
 							&state,
 							i,

From 765049d4d426e176502cac9c024b7941954d09d5 Mon Sep 17 00:00:00 2001
From: alex-botw <101593696+alex-botw@users.noreply.github.com>
Date: Tue, 9 Dec 2025 14:24:07 +0300
Subject: [PATCH 2/2] Update HardwareBreakpoints.cpp

---
 plugins/HardwareBreakpoints/HardwareBreakpoints.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/HardwareBreakpoints/HardwareBreakpoints.cpp b/plugins/HardwareBreakpoints/HardwareBreakpoints.cpp
index 727db2a4a..83bf4ff20 100644
--- a/plugins/HardwareBreakpoints/HardwareBreakpoints.cpp
+++ b/plugins/HardwareBreakpoints/HardwareBreakpoints.cpp
@@ -165,7 +165,8 @@ void HardwareBreakpoints::setupBreakpoints() {
 				thread->getState(&state);
 
 				for (int i = 0; i < RegisterCount; ++i) {
-					if (edb::v1::eval_expression(addresses_[i]->text(), &addr[i])) {
+					const BreakpointState bp_state = breakpoint_state(&state, i);
+					if (ok[i] || bp_state.enabled) {
 						set_breakpoint_state(
 							&state,
 							i,