diff --git a/OpenRA.Game/Network/Connection.cs b/OpenRA.Game/Network/Connection.cs index e6c2683161..9e1e8c6e8b 100644 --- a/OpenRA.Game/Network/Connection.cs +++ b/OpenRA.Game/Network/Connection.cs @@ -366,7 +366,7 @@ namespace OpenRA.Network public string ErrorMessage => errorMessage; - void Dispose(bool disposing) + void IDisposable.Dispose() { if (disposed) return; @@ -377,13 +377,7 @@ namespace OpenRA.Network // This will mark the connection as no longer connected and the thread will terminate cleanly. tcp?.Close(); - if (disposing) - Recorder?.Dispose(); - } - - void IDisposable.Dispose() - { - Dispose(true); + Recorder?.Dispose(); } } } diff --git a/OpenRA.Platforms.Default/FrameBuffer.cs b/OpenRA.Platforms.Default/FrameBuffer.cs index f3e39a2b46..d5d7d719d3 100644 --- a/OpenRA.Platforms.Default/FrameBuffer.cs +++ b/OpenRA.Platforms.Default/FrameBuffer.cs @@ -142,17 +142,11 @@ namespace OpenRA.Platforms.Default } public void Dispose() - { - Dispose(true); - } - - void Dispose(bool disposing) { if (disposed) return; disposed = true; - if (disposing) - texture.Dispose(); + texture.Dispose(); OpenGL.glDeleteFramebuffers(1, ref framebuffer); OpenGL.CheckGLError(); diff --git a/OpenRA.Platforms.Default/Sdl2HardwareCursor.cs b/OpenRA.Platforms.Default/Sdl2HardwareCursor.cs index f1cdc98954..9f6c439ff4 100644 --- a/OpenRA.Platforms.Default/Sdl2HardwareCursor.cs +++ b/OpenRA.Platforms.Default/Sdl2HardwareCursor.cs @@ -45,11 +45,6 @@ namespace OpenRA.Platforms.Default } public void Dispose() - { - Dispose(true); - } - - void Dispose(bool disposing) { if (Cursor != IntPtr.Zero) { diff --git a/OpenRA.Platforms.Default/Texture.cs b/OpenRA.Platforms.Default/Texture.cs index 9508b72336..3ee88980a3 100644 --- a/OpenRA.Platforms.Default/Texture.cs +++ b/OpenRA.Platforms.Default/Texture.cs @@ -206,11 +206,6 @@ namespace OpenRA.Platforms.Default } public void Dispose() - { - Dispose(true); - } - - void Dispose(bool disposing) { if (disposed) return; diff --git a/OpenRA.Platforms.Default/VertexBuffer.cs b/OpenRA.Platforms.Default/VertexBuffer.cs index 21f3082ef5..fcd3f377a1 100644 --- a/OpenRA.Platforms.Default/VertexBuffer.cs +++ b/OpenRA.Platforms.Default/VertexBuffer.cs @@ -96,11 +96,6 @@ namespace OpenRA.Platforms.Default } public void Dispose() - { - Dispose(true); - } - - void Dispose(bool disposing) { if (disposed) return;