Condition Values Variables fixed

rappen · Feb 4, 2023 · 7f2ba15 · 7f2ba15
1 parent d57670e
commit 7f2ba15
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/FetchXmlBuilder/Converters/CSharpCodeGenerator.cs b/FetchXmlBuilder/Converters/CSharpCodeGenerator.cs
@@ -1193,6 +1193,7 @@ private string GetConditionValues(string entity, ConditionExpression cond, strin
             var i = 1;
             foreach (var value in cond.Values)
             {
+                var usetoken = settings.FilterVariables;
                 var valuestr = string.Empty;
 
                 if (enumattr != null)
@@ -1208,12 +1209,14 @@ private string GetConditionValues(string entity, ConditionExpression cond, strin
                         case QExFlavorEnum.LCGconstants:
                             var lcgenumvalue = optionsetvalue.GetOptionSetValueName(settings.LCG_Settings);
                             valuestr = $"(int){lcgentity}.{lcgoptionset}.{lcgenumvalue}";
+                            usetoken = false;
                             break;
 
                         case QExFlavorEnum.EBGconstants:
                         case QExFlavorEnum.EarlyBound:
                             var ebgenumvalue = LCG.Extensions.StringToCSharpIdentifier(optionsetvalue.Label.UserLocalizedLabel.Label);
                             valuestr = $"(int){ebgoptionset}.{ebgenumvalue}";
+                            usetoken = false;
                             break;
 
                         default:
@@ -1233,7 +1236,7 @@ private string GetConditionValues(string entity, ConditionExpression cond, strin
                 {
                     valuestr = value.ToString();
                 }
-                if (settings.FilterVariables)
+                if (usetoken)
                 {
                     if (cond.Values.Count == 1)
                     {