Fix #537

bcssov · bcssov · commit 16695d55fc5c · 2025-02-21T22:40:13.000+01:00
diff --git a/src/IronyModManager.Parser/Games/Stellaris/OverwrittenObjectSingleFileParser.cs b/src/IronyModManager.Parser/Games/Stellaris/OverwrittenObjectSingleFileParser.cs
@@ -4,7 +4,7 @@
 // Created          : 10-25-2021
 //
 // Last Modified By : Mario
-// Last Modified On : 10-21-2024
+// Last Modified On : 02-21-2025
 // ***********************************************************************
 // <copyright file="OverwrittenObjectSingleFileParser.cs" company="Mario">
 //     Mario
@@ -60,6 +60,8 @@ public class OverwrittenObjectSingleFileParser : BaseParser, IGameParser
         /// </summary>
         /// <param name="codeParser">The code parser.</param>
         /// <param name="logger">The logger.</param>
+        /// <seealso cref="T:IronyModManager.Parser.Common.Parsers.IDefaultParser" />
+        /// <remarks>Initializes a new instance of the <see cref="T:IronyModManager.Parser.Common.Parsers.BaseParser" /> class.</remarks>
         public OverwrittenObjectSingleFileParser(ICodeParser codeParser, ILogger logger) : base(codeParser, logger)
         {
         }
@@ -127,7 +129,8 @@ public override IEnumerable<IDefinition> Parse(ParserArgs args)
                             {
                                 foreach (var block in items)
                                 {
-                                    if (mergeSegments.Values.FirstOrDefault()!.Values.All(p => (p.Key ?? string.Empty).Equals(block, StringComparison.OrdinalIgnoreCase)))
+                                    if (mergeSegments.Values.FirstOrDefault() != null && mergeSegments.Values.FirstOrDefault()!.Values != null &&
+                                        mergeSegments.Values.FirstOrDefault()!.Values.All(p => (p.Key ?? string.Empty).Equals(block, StringComparison.OrdinalIgnoreCase)))
                                     {
                                         item.MergeType = MergeType.FlatMerge;
                                     }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`// Created : 10-25-2021`
`5`	`5`	`//`
`6`	`6`	`// Last Modified By : Mario`
`7`		`-// Last Modified On : 10-21-2024`
	`7`	`+// Last Modified On : 02-21-2025`
`8`	`8`	`// ***********************************************************************`
`9`	`9`	`// <copyright file="OverwrittenObjectSingleFileParser.cs" company="Mario">`
`10`	`10`	`// Mario`
`@@ -60,6 +60,8 @@ public class OverwrittenObjectSingleFileParser : BaseParser, IGameParser`
`60`	`60`	`/// </summary>`
`61`	`61`	`/// <param name="codeParser">The code parser.</param>`
`62`	`62`	`/// <param name="logger">The logger.</param>`
	`63`	`+ /// <seealso cref="T:IronyModManager.Parser.Common.Parsers.IDefaultParser" />`
	`64`	`+ /// <remarks>Initializes a new instance of the <see cref="T:IronyModManager.Parser.Common.Parsers.BaseParser" /> class.</remarks>`
`63`	`65`	`public OverwrittenObjectSingleFileParser(ICodeParser codeParser, ILogger logger) : base(codeParser, logger)`
`64`	`66`	`{`
`65`	`67`	`}`
`@@ -127,7 +129,8 @@ public override IEnumerable<IDefinition> Parse(ParserArgs args)`
`127`	`129`	`{`
`128`	`130`	`foreach (var block in items)`
`129`	`131`	`{`
`130`		`- if (mergeSegments.Values.FirstOrDefault()!.Values.All(p => (p.Key ?? string.Empty).Equals(block, StringComparison.OrdinalIgnoreCase)))`
	`132`	`+ if (mergeSegments.Values.FirstOrDefault() != null && mergeSegments.Values.FirstOrDefault()!.Values != null &&`
	`133`	`+ mergeSegments.Values.FirstOrDefault()!.Values.All(p => (p.Key ?? string.Empty).Equals(block, StringComparison.OrdinalIgnoreCase)))`
`131`	`134`	`{`
`132`	`135`	`item.MergeType = MergeType.FlatMerge;`
`133`	`136`	`}`