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

Dispose FileSystemWatchers in LuaConsole

This commit is contained in:
kalimag 2022-11-27 19:54:01 +01:00 committed by James Groom
parent 28d6415190
commit 733a8bee88
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
View File

@ -127,6 +127,7 @@ namespace BizHawk.Client.EmuHawk
DisplayManager.ClearApiHawkSurfaces(); DisplayManager.ClearApiHawkSurfaces();
ResetDrawSurfacePadding(); ResetDrawSurfacePadding();
ClearFileWatches();
(LuaImp as Win32LuaLibraries)?.Close(); (LuaImp as Win32LuaLibraries)?.Close();
DisplayManager.OSD.ClearGuiText(); DisplayManager.OSD.ClearGuiText();
} }
@ -258,7 +259,7 @@ namespace BizHawk.Client.EmuHawk
{ {
if (Settings.ReloadOnScriptFileChange) if (Settings.ReloadOnScriptFileChange)
{ {
_watches.Clear(); ClearFileWatches();
foreach (var item in LuaImp.ScriptList.Where(s => !s.IsSeparator)) foreach (var item in LuaImp.ScriptList.Where(s => !s.IsSeparator))
{ {
var processedPath = Config.PathEntries.TryMakeRelative(item.Path); var processedPath = Config.PathEntries.TryMakeRelative(item.Path);
@ -269,6 +270,13 @@ namespace BizHawk.Client.EmuHawk
} }
} }
private void ClearFileWatches()
{
foreach (var watch in _watches)
watch.Dispose();
_watches.Clear();
}
private void CreateFileWatcher(string path) private void CreateFileWatcher(string path)
{ {
var (dir, file) = path.SplitPathToDirAndFile(); var (dir, file) = path.SplitPathToDirAndFile();
@ -286,9 +294,19 @@ namespace BizHawk.Client.EmuHawk
_watches.Add(watcher); _watches.Add(watcher);
} }
private void RemoveFileWatcher(string path)
{
var (dir, file) = path.SplitPathToDirAndFile();
var watcher = _watches.Find(watcher => watcher.Path == dir && watcher.Filter == file);
if (watcher != null)
{
_watches.Remove(watcher);
watcher.Dispose();
}
}
private void OnChanged(object source, FileSystemEventArgs e) private void OnChanged(object source, FileSystemEventArgs e)
{ {
// Even after _watches is cleared, these callbacks hang around! So this check is necessary
var script = LuaImp.ScriptList.FirstOrDefault(s => s.Path == e.FullPath && s.Enabled); var script = LuaImp.ScriptList.FirstOrDefault(s => s.Path == e.FullPath && s.Enabled);
if (script != null) Invoke((MethodInvoker) (() => RefreshLuaScript(script))); if (script != null) Invoke((MethodInvoker) (() => RefreshLuaScript(script)));
} }
@ -350,7 +368,11 @@ namespace BizHawk.Client.EmuHawk
private void RemoveLuaFile(LuaFile item) private void RemoveLuaFile(LuaFile item)
{ {
LuaImp.RegisteredFunctions.RemoveForFile(item, Emulator); if (!item.IsSeparator)
{
LuaImp.RegisteredFunctions.RemoveForFile(item, Emulator);
RemoveFileWatcher(item.Path);
}
LuaImp.ScriptList.Remove(item); LuaImp.ScriptList.Remove(item);
} }
@ -1100,7 +1122,7 @@ namespace BizHawk.Client.EmuHawk
} }
else else
{ {
_watches.Clear(); ClearFileWatches();
} }
} }