ApacheTech
commented
2 years ago Some of this will not work. I've used using statements, so where you see
using var imageSurface = new ImageSurface(...);
using var context = genContext(imageSurface);
// Do Stuff.it automatically disposes at the end of the scope. It's the same as doing
using (var imageSurface = new ImageSurface(...))
{
using (var context = genContext(imageSurface))
{
// Do Stuff.
}
}or
var imageSurface = new ImageSurface(...);
var context = genContext(imageSurface);
// Do Stuff.
imageSurface.Dispose();
context.Dispose();https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/keywords/using-statement
I'll have to change Patch_PlayerMapLayer_OnMapOpenedClient_Prefix to handle disposing the surface and context, once they've been handled. The original code was copypasta from the vanilla class, and then just refactored, and extracted into methods for re-use. I just need to follow the code-flow, and work out exactly where things need disposing.
The most annoying thing is that I get no warnings or errors, at all. Even with the environment variables set, and every single debug option in the game enabled. I'm running it through Visual Studio, with all debug and trace output redirected to the Output Window.
svanheulen
Unfortunately c4ca2ac didn't fix issue #9. I wasn't able to get the VS dev environment working in Arch Linux so I couldn't compile and test these changes, but I think this should resolve the issue.
In
PlayerMapLayerPatches.cstheLoadTexturemethod was getting called multiple times fromPatch_PlayerMapLayer_OnMapOpenedClient_Prefix, which was causing the_imageSurfaceand_contextclass variables to get reassigned beforePatch_PlayerMapLayer_Dispose_Prefixhad a chance to dispose of them. From the API docs, it seems likeICoreClientAPI.Gui.LoadCairoTexturecopies the surface to an OpenGL texture so I think it's safe to dispose of it after that call. But that needs to be tested.The other 3 files I changed all had the same issue. The
ComposeHovermethod properly disposed of the context and surface but theGenerateEnabledTextureandComposemethods were missing that.