Skip to content

Dispose Glfw/Sdl When Checking if Applicable #2352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Perksey merged 2 commits into from
Nov 11, 2024
Merged

Dispose Glfw/Sdl When Checking if Applicable #2352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59e8f69
Dispose Glfw when Checking if Applicable
Aragas Nov 11, 2024
07b72b6
Dispose Sdl when Checking if Applicable
Aragas Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Windowing/Silk.NET.Windowing.Glfw/GlfwPlatform.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ internal class GlfwPlatform : IWindowPlatform
(
() =>
{
GLFW.Glfw? api = null;
try
{
GLFW.Glfw.GetApi(); // activate the class so we can determine if we can activate the class
api = GLFW.Glfw.GetApi(); // activate the class so we can determine if we can activate the class
}
catch (Exception ex)
{
Expand All @@ -34,6 +35,10 @@ internal class GlfwPlatform : IWindowPlatform
#endif
return false;
}
finally
{
api?.Dispose();
}

return true;
}
Expand Down
7 changes: 6 additions & 1 deletion src/Windowing/Silk.NET.Windowing.Sdl/SdlPlatform.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,10 @@ public static SdlPlatform GetOrRegister()
(
() =>
{
SDL.Sdl? api = null;
try
{
SDL.Sdl.GetApi();
api = SDL.Sdl.GetApi();
}
catch (Exception ex)
{
Expand All @@ -45,6 +46,10 @@ public static SdlPlatform GetOrRegister()
#endif
return false;
}
finally
{
api?.Dispose();
}

return true;
}
Expand Down