Merge branch 'dev' into skia-native-arm

1 files changed, 5 insertions, 3 deletions

diff --git a/Emby.Server.Implementations/Net/DisposableManagedObjectBase.cs b/Emby.Server.Implementations/Net/DisposableManagedObjectBase.cs
index b721e8a26..9d880b0c9 100644
--- a/Emby.Server.Implementations/Net/DisposableManagedObjectBase.cs
+++ b/Emby.Server.Implementations/Net/DisposableManagedObjectBase.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Emby.Server.Implementations.Net
 {
@@ -16,15 +16,17 @@ namespace Emby.Server.Implementations.Net
         /// <param name="disposing">True if managed objects should be disposed, if false, only unmanaged resources should be released.</param>
         protected abstract void Dispose(bool disposing);
 
+
+        //TODO Remove and reimplement using the IsDisposed property directly.
         /// <summary>
-        /// Throws and <see cref="System.ObjectDisposedException"/> if the <see cref="IsDisposed"/> property is true.
+        /// Throws an <see cref="System.ObjectDisposedException"/> if the <see cref="IsDisposed"/> property is true.
         /// </summary>
         /// <seealso cref="IsDisposed"/>
         /// <exception cref="System.ObjectDisposedException">Thrown if the <see cref="IsDisposed"/> property is true.</exception>
         /// <seealso cref="Dispose()"/>
         protected virtual void ThrowIfDisposed()
         {
-            if (this.IsDisposed) throw new ObjectDisposedException(this.GetType().FullName);
+            if (IsDisposed) throw new ObjectDisposedException(GetType().Name);
         }
 
         #endregion