#45: fixes (int)null cast in SetImage

antonmihaylov · Apr 16, 2024 · 28206cb · 28206cb
1 parent 77b52f0
commit 28206cb
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/OpenXMLTemplates/ControlReplacers/ControlReplacer.cs b/OpenXMLTemplates/ControlReplacers/ControlReplacer.cs
@@ -245,12 +245,14 @@ protected static void SetImage(OpenXmlElement element, string newValue, Wordproc
                 return;
 
             var index = 0;
-            try
-            {
-                index = (int)variableSource.GetVariable("index");
-            }
-            catch (VariableNotFoundException)
+            try 
             {
+                var vsIndex = variableSource.GetVariable("index");
+                if (vsIndex != null) 
+                {
+                    index = (int)vsIndex;
+                }
+            } catch (VariableNotFoundException) {
             }
 
             var tagName = element.First().GetFirstChild<Tag>().Val.Value;
@@ -321,4 +323,4 @@ protected virtual void OnInnerControlReplacementEnqueued(ControlReplacementExecu
 
         #endregion
     }
-}
+}