Fix crashes caused by non-existing streams referenced from playlist files

UniqProject · UniqProject · commit c5afcdb4ac98 · 2020-12-08T22:21:46.000+01:00
diff --git a/BDInfo/FormMain.cs b/BDInfo/FormMain.cs
@@ -1048,7 +1048,8 @@ private void ScanBDROM()
                 foreach (TSStreamFile streamFile
                     in BDROM.StreamFiles.Values)
                 {
-                    streamFiles.Add(streamFile);
+                    if (streamFile != null)
+                        streamFiles.Add(streamFile);
                 }
             }
             else
@@ -1065,7 +1066,7 @@ private void ScanBDROM()
                         foreach (TSStreamClip clip
                             in playlist.StreamClips)
                         {
-                            if (!streamFiles.Contains(clip.StreamFile))
+                            if (clip.StreamFile != null && !streamFiles.Contains(clip.StreamFile))
                             {
                                 streamFiles.Add(clip.StreamFile);
                             }

Original file line number	Diff line number	Diff line change
`@@ -1048,7 +1048,8 @@ private void ScanBDROM()`
`1048`	`1048`	`foreach (TSStreamFile streamFile`
`1049`	`1049`	`in BDROM.StreamFiles.Values)`
`1050`	`1050`	`{`
`1051`		`- streamFiles.Add(streamFile);`
	`1051`	`+ if (streamFile != null)`
	`1052`	`+ streamFiles.Add(streamFile);`
`1052`	`1053`	`}`
`1053`	`1054`	`}`
`1054`	`1055`	`else`
`@@ -1065,7 +1066,7 @@ private void ScanBDROM()`
`1065`	`1066`	`foreach (TSStreamClip clip`
`1066`	`1067`	`in playlist.StreamClips)`
`1067`	`1068`	`{`
`1068`		`- if (!streamFiles.Contains(clip.StreamFile))`
	`1069`	`+ if (clip.StreamFile != null && !streamFiles.Contains(clip.StreamFile))`
`1069`	`1070`	`{`
`1070`	`1071`	`streamFiles.Add(clip.StreamFile);`
`1071`	`1072`	`}`