Mantis #2109

Prevent a null reference exception when reset is pressed on a script
while it's being compiled.

1 files changed, 2 insertions, 0 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 6b674f3..311ec86 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -571,6 +571,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
         public void ResetScript()
         {
+            if (m_script == null)
+                return;
             bool running = Running;
 
             RemoveState();