Merge pull request #101 from nventive/dev/jpl/fix

fix: Don't throw ObjectDisposedException when calling RaisePropertyCh…
nventive · Jun 18, 2024 · f49027a · f49027a
2 parents 7b2eb5b + 24b7c98
commit f49027a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/src/DynamicMvvm.Tests/Integration/IntegrationTests.cs b/src/DynamicMvvm.Tests/Integration/IntegrationTests.cs
@@ -110,7 +110,23 @@ public void A_disposed_VM_cannot_be_mutated()
 			Assert.Throws<ObjectDisposedException>(() => viewModel.SetErrors(errors: new Dictionary<string, IEnumerable<object>>()));
 			Assert.Throws<ObjectDisposedException>(() => viewModel.ClearErrors(nameof(MyViewModel.Counter)));
 			Assert.Throws<ObjectDisposedException>(() => viewModel.Dispatcher = new TestDispatcher());
-			Assert.Throws<ObjectDisposedException>(() => viewModel.RaisePropertyChanged(nameof(MyViewModel.Counter)));
+		}
+
+		[Fact]
+		public void A_disposed_VM_does_not_raise_PropertyChanged()
+		{
+			// Arrange
+			var viewModel = new MyViewModel(_serviceProvider);
+
+			var raised = false;
+			viewModel.PropertyChanged += (s, e) => raised = true;
+
+			// Act
+			viewModel.Dispose();
+			viewModel.Counter++;
+
+			// Assert
+			raised.Should().BeFalse();
 		}
 
 		[Fact]

diff --git a/src/DynamicMvvm/ViewModel/ViewModelBase.PropertyChanged.cs b/src/DynamicMvvm/ViewModel/ViewModelBase.PropertyChanged.cs
@@ -13,14 +13,18 @@ public partial class ViewModelBase
 		/// <inheritdoc />
 		public virtual void RaisePropertyChanged(string propertyName)
 		{
-			ThrowIfDisposed();
-
 			if (_isDisposing)
 			{
 				_logger.LogViewModelSkippedMethodBecauseDisposing_PropertyName(nameof(RaisePropertyChanged), GetType().Name, propertyName, Name);
 				return;
 			}
 
+			if (_isDisposed)
+			{
+				_logger.LogViewModelSkippedMethodBecauseDisposed_PropertyName(nameof(RaisePropertyChanged), GetType().Name, propertyName, Name);
+				return;
+			}
+
 			if (PropertyChanged == null)
 			{
 				return;