epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8529 from pchote/fix-mission-quit-desync

Browse Source 
Use INotifyActorDisposing to dispose LuaScript as part of the world disposal.
This commit is contained in:
abcdefg30
2015-06-21 21:35:02 +02:00
parent 7e374b53e3 f8205d3d22
commit 70754b72f5
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Scripting/LuaScript.cs
View File

@@ -24,7 +24,7 @@ namespace OpenRA.Mods.Common.Scripting
public object Create(ActorInitializer init) { return new LuaScript(this); } public object Create(ActorInitializer init) { return new LuaScript(this); }
} }
public sealed class LuaScript : ITick, IWorldLoaded, IDisposable public class LuaScript : ITick, IWorldLoaded, INotifyActorDisposing
{ {
readonly LuaScriptInfo info; readonly LuaScriptInfo info;
ScriptContext context; ScriptContext context;
@@ -46,10 +46,16 @@ namespace OpenRA.Mods.Common.Scripting
context.Tick(self); context.Tick(self);
} }
public void Dispose() bool disposed;
public void Disposing(Actor self)
{ {
if (disposed)
return;
if (context != null) if (context != null)
context.Dispose(); context.Dispose();
disposed = true;
} }
public bool FatalErrorOccurred { get { return context.FatalErrorOccurred; } } public bool FatalErrorOccurred { get { return context.FatalErrorOccurred; } }