godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not call Array default constructor when not necessary. 

This fixes a bug where Array would get registered twice with the
DisposablesTracker causing an exception on shutdown.

Fixes #81231

(cherry picked from commit 43a6748dfd)
This commit is contained in:
Sami Kalliomäki 2023-09-02 21:22:23 +01:00 committed by Yuri Sizov
parent cdc26082aa
commit c26722badf
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs
View File

@ -52,7 +52,7 @@ namespace Godot.Collections
/// </summary> /// </summary>
/// <param name="array">The objects to put in the new array.</param> /// <param name="array">The objects to put in the new array.</param>
/// <returns>A new Godot Array.</returns> /// <returns>A new Godot Array.</returns>
public Array(Variant[] array) : this() public Array(Variant[] array)
{ {
if (array == null) if (array == null)
throw new ArgumentNullException(nameof(array)); throw new ArgumentNullException(nameof(array));
@ -68,7 +68,7 @@ namespace Godot.Collections
this[i] = array[i]; this[i] = array[i];
} }
public Array(Span<StringName> array) : this() public Array(Span<StringName> array)
{ {
if (array == null) if (array == null)
throw new ArgumentNullException(nameof(array)); throw new ArgumentNullException(nameof(array));
@ -84,7 +84,7 @@ namespace Godot.Collections
this[i] = array[i]; this[i] = array[i];
} }
public Array(Span<NodePath> array) : this() public Array(Span<NodePath> array)
{ {
if (array == null) if (array == null)
throw new ArgumentNullException(nameof(array)); throw new ArgumentNullException(nameof(array));
@ -100,7 +100,7 @@ namespace Godot.Collections
this[i] = array[i]; this[i] = array[i];
} }
public Array(Span<Rid> array) : this() public Array(Span<Rid> array)
{ {
if (array == null) if (array == null)
throw new ArgumentNullException(nameof(array)); throw new ArgumentNullException(nameof(array));
@ -121,7 +121,7 @@ namespace Godot.Collections
// fine as long as the array is not mutated. However, Span does this type checking at // fine as long as the array is not mutated. However, Span does this type checking at
// instantiation, so it's not possible to use it even when not mutating anything. // instantiation, so it's not possible to use it even when not mutating anything.
// ReSharper disable once RedundantNameQualifier // ReSharper disable once RedundantNameQualifier
public Array(ReadOnlySpan<GodotObject> array) : this() public Array(ReadOnlySpan<GodotObject> array)
{ {
if (array == null) if (array == null)
throw new ArgumentNullException(nameof(array)); throw new ArgumentNullException(nameof(array));
@ -1057,7 +1057,7 @@ namespace Godot.Collections
/// </summary> /// </summary>
/// <param name="array">The items to put in the new array.</param> /// <param name="array">The items to put in the new array.</param>
/// <returns>A new Godot Array.</returns> /// <returns>A new Godot Array.</returns>
public Array(T[] array) : this() public Array(T[] array)
{ {
if (array == null) if (array == null)
throw new ArgumentNullException(nameof(array)); throw new ArgumentNullException(nameof(array));