From fcceba182cf86ae54048a468cd2edd4b5b91966b Mon Sep 17 00:00:00 2001
From: FellippeHeitor <fellippeheitor@gmail.com>
Date: Wed, 29 Sep 2021 21:23:59 -0300
Subject: [PATCH] Fix procedure to clear existing watchpoint

---
 source/ide/ide_methods.bas | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/source/ide/ide_methods.bas b/source/ide/ide_methods.bas
index 11dde2f80..301bfe9be 100644
--- a/source/ide/ide_methods.bas
+++ b/source/ide/ide_methods.bas
@@ -8581,16 +8581,18 @@ FUNCTION idevariablewatchbox$(currentScope$, filter$, selectVar, returnAction)
                                 END SELECT
                             END IF
 
-                            IF INSTR(varType$, "STRING") = 0 THEN
-                                v$ = op$ + actualValue$
-                                IF v$ <> op$ + LTRIM$(STR$(VAL(actualValue$))) THEN
-                                    result = idemessagebox(dlgTitle$, "Invalid expression.\nYou can use =, <>, >, >=, <, <=, and a literal value\n(scientific notation not allowed).", "#OK")
-                                    _KEYCLEAR
-                                    GOTO getNewValueInput
+                            IF thisReturnAction <> 3 THEN
+                                IF INSTR(varType$, "STRING") = 0 THEN
+                                    v$ = op$ + actualValue$
+                                    IF v$ <> op$ + LTRIM$(STR$(VAL(actualValue$))) THEN
+                                        result = idemessagebox(dlgTitle$, "Invalid expression.\nYou can use =, <>, >, >=, <, <=, and a literal value\n(scientific notation not allowed).", "#OK")
+                                        _KEYCLEAR
+                                        GOTO getNewValueInput
+                                    END IF
                                 END IF
-                            END IF
 
-                            v$ = op$ + " " + actualValue$ 'just to prettify it
+                                v$ = op$ + " " + actualValue$ 'just to prettify it
+                            END IF
                         END IF
 
                         cmd$ = ""