From f7e53e9166c7e2a601653967e84c51367fde9a37 Mon Sep 17 00:00:00 2001
From: FellippeHeitor <fellippeheitor@gmail.com>
Date: Tue, 24 Aug 2021 14:46:57 -0300
Subject: [PATCH] Fixes "Add All" adding UDTs in Watch List dialog.

---
 source/ide/ide_methods.bas | 6 +++++-
 source/qb64.bas            | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/source/ide/ide_methods.bas b/source/ide/ide_methods.bas
index 99a901617..fcfcf140a 100644
--- a/source/ide/ide_methods.bas
+++ b/source/ide/ide_methods.bas
@@ -7952,7 +7952,11 @@ FUNCTION idevariablewatchbox$(currentScope$, filter$, selectVar, returnAction)
 
         IF (focus = 3 AND info <> 0) THEN 'add all
             FOR y = 1 TO totalVisibleVariables
-                IF usedVariableList(varDlgList(y).index).isarray AND LEN(usedVariableList(varDlgList(y).index).watchRange) = 0 THEN _CONTINUE
+                varType$ = usedVariableList(y).varType
+                IF INSTR(varType$, "STRING *") THEN varType$ = "STRING"
+                IF INSTR(varType$, "_BIT *") THEN varType$ = "_BIT"
+                IF (usedVariableList(varDlgList(y).index).isarray AND LEN(usedVariableList(varDlgList(y).index).watchRange) = 0) OR _
+                   INSTR(nativeDataTypes$, varType$) = 0 THEN _CONTINUE
                 usedVariableList(varDlgList(y).index).watch = -1
                 ASC(idetxt(o(varListBox).txt), varDlgList(y).colorFlag) = variableNameColor
                 ASC(idetxt(o(varListBox).txt), varDlgList(y).colorFlag2) = typeColumnColor
diff --git a/source/qb64.bas b/source/qb64.bas
index b21d66f3d..dfade8ca4 100644
--- a/source/qb64.bas
+++ b/source/qb64.bas
@@ -34,7 +34,7 @@ vWatchVariableExclusions$ = "@__LONG_VWATCH_LINENUMBER@__LONG_VWATCH_SUBLEVEL@__
               "@__ARRAY_BYTE_VWATCH_SKIPLINES@__STRING_VWATCH_INTERNALSUBNAME@__ARRAY_STRING_VWATCH_STACK@"
 
 DIM SHARED nativeDataTypes$
-nativeDataTypes$ = "@_BIT@_BYTE@_UNSIGNED _BYTE@BYTE@UNSIGNED BYTE@INTEGER@_UNSIGNED INTEGER@UNSIGNED INTEGER@LONG@_UNSIGNED LONG@UNSIGNED LONG@_INTEGER64@INTEGER64@_UNSIGNED _INTEGER64@UNSIGNED INTEGER64@SINGLE@DOUBLE@_FLOAT@FLOAT@STRING@"
+nativeDataTypes$ = "@_OFFSET@OFFSET@_UNSIGNED _OFFSET@UNSIGNED OFFSET@_BIT@BIT@_UNSIGNED _BIT@UNSIGNED BIT@_BYTE@_UNSIGNED _BYTE@BYTE@UNSIGNED BYTE@INTEGER@_UNSIGNED INTEGER@UNSIGNED INTEGER@LONG@_UNSIGNED LONG@UNSIGNED LONG@_INTEGER64@INTEGER64@_UNSIGNED _INTEGER64@UNSIGNED INTEGER64@SINGLE@DOUBLE@_FLOAT@FLOAT@STRING@"
 
 DIM SHARED qb64prefix_set_recompileAttempts, qb64prefix_set_desiredState
 DIM SHARED opex_recompileAttempts, opex_desiredState