fix double-dispose in WeatherParticle

TimtyG · TimtyG · commit 892c2a1cd22f · 2025-03-27T10:29:40.000+01:00
diff --git a/Intersect.Client.Core/Maps/WeatherParticle.cs b/Intersect.Client.Core/Maps/WeatherParticle.cs
@@ -41,6 +41,8 @@ public partial class WeatherParticle : IWeatherParticle
 
     private int yVelocity;
 
+    private bool _disposed = false;
+
     public WeatherParticle(List<IWeatherParticle> RemoveParticle, int xvelocity, int yvelocity, AnimationDescriptor anim)
     {
         TransmittionTimer = Timing.Global.MillisecondsUtc;
@@ -150,7 +152,13 @@ public void Update()
 
     public void Dispose()
     {
-        animInstance.Dispose();
+        if (_disposed) return;
+
+        _disposed = true;
+
+        animInstance?.Dispose();
+
+        GC.SuppressFinalize(this);
     }
 
     ~WeatherParticle()

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ public partial class WeatherParticle : IWeatherParticle`
`41`	`41`
`42`	`42`	`private int yVelocity;`
`43`	`43`
	`44`	`+ private bool _disposed = false;`
	`45`	`+`
`44`	`46`	`public WeatherParticle(List<IWeatherParticle> RemoveParticle, int xvelocity, int yvelocity, AnimationDescriptor anim)`
`45`	`47`	`{`
`46`	`48`	`TransmittionTimer = Timing.Global.MillisecondsUtc;`
`@@ -150,7 +152,13 @@ public void Update()`
`150`	`152`
`151`	`153`	`public void Dispose()`
`152`	`154`	`{`
`153`		`- animInstance.Dispose();`
	`155`	`+ if (_disposed) return;`
	`156`	`+`
	`157`	`+ _disposed = true;`
	`158`	`+`
	`159`	`+ animInstance?.Dispose();`
	`160`	`+`
	`161`	`+ GC.SuppressFinalize(this);`
`154`	`162`	`}`
`155`	`163`
`156`	`164`	`~WeatherParticle()`