ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

try to fix issues where reloading Citra when recording a movie results a crash due to the temp user folder having active file handles 

unloading the dll would forcefully evict these file handles. unknown whether Linux does the same with the .so, perhaps it does, perhaps it doesn't. not really any extra harm if it doesn't
This commit is contained in:
CasualPokePlayer 2023-11-11 09:07:38 -08:00
parent e9468cb0c8
commit f9c85172e4
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.cs
View File

@ -15,13 +15,17 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
[ServiceNotApplicable(new[] { typeof(IDriveLight), typeof(IRegionable) })]
public partial class Citra
{
private static readonly LibCitra _core;
private static DynamicLibraryImportResolver _resolver;
private static LibCitra _core;
static Citra()
// This is a hack, largely just so we can forcefully evict file handles Citra keeps open even after shutdown.
// While keeping these file handles open is mostly harmless, this ends up being bad when recording a movie.
// These file handles would be in the user folder, and the user folder must be cleared out when recording a movie!
private static void ResetCitraResolver()
{
var resolver = new DynamicLibraryImportResolver(
OSTailoredCode.IsUnixHost ? "libcitra-headless.so" : "citra-headless.dll", hasLimitedLifetime: false);
_core = BizInvoker.GetInvoker<LibCitra>(resolver, CallingConventionAdapters.Native);
_resolver?.Dispose();
_resolver = new(OSTailoredCode.IsUnixHost ? "libcitra-headless.so" : "citra-headless.dll", hasLimitedLifetime: true);
_core = BizInvoker.GetInvoker<LibCitra>(_resolver, CallingConventionAdapters.Native);
}
private static Citra CurrentCore;
@ -48,6 +52,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
}
CurrentCore?.Dispose();
ResetCitraResolver();
CurrentCore = this;
_serviceProvider = new(this);