Prevent character overflow

Fixes #18
maybegreat48 · Jan 7, 2024 · c6a44f3 · c6a44f3
1 parent 24cd62c
commit c6a44f3
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/GTA V Script Decompiler/Function.cs b/GTA V Script Decompiler/Function.cs
@@ -264,18 +264,18 @@ public void ApplyVarAutoNames(VariableStorage storage, string prefix = "")
 
 				if (setNames.ContainsKey(name))
 				{
-					if (local.AutoName.GetNameCollisionBehavior() == AutoName.NameCollisionBehavior.AddNumberSuffix)
-					{
-						setNames[name]++;
-						name += setNames[name];
-					}
-					else if (local.AutoName.GetNameCollisionBehavior() == AutoName.NameCollisionBehavior.IncrementCharacter)
+					if (local.AutoName.GetNameCollisionBehavior() == AutoName.NameCollisionBehavior.IncrementCharacter && (name[^1] + (setNames[name]-1)) < 'z')
 					{
 						setNames[name]++;
 						var chr = name[^1];
 						chr += (char)(setNames[name] - 1);
 						name = chr.ToString(); // TODO
 					}
+					else
+					{
+                        setNames[name]++;
+                        name += setNames[name];
+                    }
 				}
 				else
 				{