From 50f06f389ade0911562c6f37dd5611eac1ad6c4a Mon Sep 17 00:00:00 2001
From: Deukhoofd <Deukhoofd@gmail.com>
Date: Sun, 9 Dec 2018 18:13:19 +0100
Subject: [PATCH] Fix passing nil to CSharp functions not returning function

---
 Upsilon/BaseTypes/UserData/UpsilonBinder.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Upsilon/BaseTypes/UserData/UpsilonBinder.cs b/Upsilon/BaseTypes/UserData/UpsilonBinder.cs
index 13cc39b..6f88859 100644
--- a/Upsilon/BaseTypes/UserData/UpsilonBinder.cs
+++ b/Upsilon/BaseTypes/UserData/UpsilonBinder.cs
@@ -82,6 +82,11 @@ namespace Upsilon.BaseTypes.UserData
                             continue;
                     }
 
+                    if (argumentType == typeof(ScriptNull))
+                    {
+                        continue;
+                    }
+
                     if (!matchParameter.ParameterType.IsAssignableFrom(argumentType))
                     {
                         validMatch = false;
@@ -144,6 +149,10 @@ namespace Upsilon.BaseTypes.UserData
                     break;
             }
 
+            if (value is ScriptNull)
+            {
+                return null;
+            }
 
             var isScriptTypeRequired = typeof(ScriptType).IsAssignableFrom(type);
             var isScriptType = value is ScriptType;