Fix nullable params crashing invoke window

ManlyMarco · Feb 14, 2024 · c1cf718 · c1cf718
1 parent 6edca28
commit c1cf718
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/RuntimeUnityEditor/Windows/Inspector/VariableFieldDrawer.cs b/RuntimeUnityEditor/Windows/Inspector/VariableFieldDrawer.cs
@@ -601,7 +601,19 @@ private static void DrawInvokeWindowFunc(int id)
                                 {
                                     var arg = _currentlyInvokingParamsValues[index];
                                     var param = methodParams[index];
-                                    var obj = ClipboardWindow.TryGetObject(arg, out var clipboardObj) ? clipboardObj : Convert.ChangeType(arg, param.ParameterType);
+                                    var paramType = param.ParameterType;
+                                    var nullableParamType = Nullable.GetUnderlyingType(paramType);
+                                    if (nullableParamType != null)
+                                    {
+                                        if (string.IsNullOrEmpty(arg))
+                                        {
+                                            paramArgs[index] = null;
+                                            continue;
+                                        }
+                                        paramType = nullableParamType;
+                                    }
+
+                                    var obj = ClipboardWindow.TryGetObject(arg, out var clipboardObj) ? clipboardObj : Convert.ChangeType(arg, paramType);
                                     paramArgs[index] = obj;
                                 }
                                 catch (Exception e)