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

C#: Throw ObjectDisposedException from disposed wrapper classes

Browse Source
This commit is contained in:
Ignacio Etcheverry 2019-02-19 00:37:10 +01:00
parent 325efb60b7
commit efd5d4bcf9
5 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/mono/glue/Managed/Files/Array.cs
View File

@ -50,6 +50,9 @@ namespace Godot.Collections
internal IntPtr GetPtr()
{
if (disposed)
throw new ObjectDisposedException(GetType().FullName);
return safeHandle.DangerousGetHandle();
}

3
modules/mono/glue/Managed/Files/Dictionary.cs
View File

@ -54,6 +54,9 @@ namespace Godot.Collections
internal IntPtr GetPtr()
{
if (disposed)
throw new ObjectDisposedException(GetType().FullName);
return safeHandle.DangerousGetHandle();
}

10
modules/mono/glue/Managed/Files/NodePath.cs
View File

@ -11,7 +11,13 @@ namespace Godot
internal static IntPtr GetPtr(NodePath instance)
{
return instance == null ? IntPtr.Zero : instance.ptr;
if (instance == null)
return IntPtr.Zero;
if (instance.disposed)
throw new ObjectDisposedException(instance.GetType().FullName);
return instance.ptr;
}
~NodePath()
@ -49,7 +55,7 @@ namespace Godot
get { return ptr; }
}
public NodePath() : this(string.Empty) {}
public NodePath() : this(string.Empty) { }
public NodePath(string path)
{

8
modules/mono/glue/Managed/Files/Object.base.cs
View File

@ -30,7 +30,13 @@ namespace Godot
internal static IntPtr GetPtr(Object instance)
{
return instance == null ? IntPtr.Zero : instance.ptr;
if (instance == null)
return IntPtr.Zero;
if (instance.disposed)
throw new ObjectDisposedException(instance.GetType().FullName);
return instance.ptr;
}
~Object()

8
modules/mono/glue/Managed/Files/RID.cs
View File

@ -11,7 +11,13 @@ namespace Godot
internal static IntPtr GetPtr(RID instance)
{
return instance == null ? IntPtr.Zero : instance.ptr;
if (instance == null)
return IntPtr.Zero;
if (instance.disposed)
throw new ObjectDisposedException(instance.GetType().FullName);
return instance.ptr;
}
~RID()