Unsubscribe before return to pool.

ChebanovDD · ChebanovDD · commit 37bac5336335 · 2023-05-01T21:53:52.000+08:00
diff --git a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UGUI/BindableUGUIElements/BindableButton.cs b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UGUI/BindableUGUIElements/BindableButton.cs
@@ -40,9 +40,10 @@ public void ResetBindingContext(IObjectProvider objectProvider)
                 return;
             }
 
+            _command.CanExecuteChanged -= OnCommandCanExecuteChanged;
+
             objectProvider.ReturnCommandWrapper(_command, _commandBindingData);
 
-            _command.CanExecuteChanged -= OnCommandCanExecuteChanged;
             _command = null;
 
             _button.onClick.RemoveListener(OnButtonClicked);
diff --git a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UGUI/BindableUGUIElements/BindableInputField.cs b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UGUI/BindableUGUIElements/BindableInputField.cs
@@ -33,9 +33,10 @@ public void ResetBindingContext(IObjectProvider objectProvider)
                 return;
             }
 
+            _valueProperty.ValueChanged -= OnPropertyValueChanged;
+
             objectProvider.ReturnProperty(_valueProperty);
 
-            _valueProperty.ValueChanged -= OnPropertyValueChanged;
             _valueProperty = null;
 
             _inputField.onValueChanged.RemoveListener(OnControlValueChanged);
diff --git a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UGUI/BindableUGUIElements/BindableLabel.cs b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UGUI/BindableUGUIElements/BindableLabel.cs
@@ -33,9 +33,10 @@ public void ResetBindingContext(IObjectProvider objectProvider)
                 return;
             }
 
+            _textProperty.ValueChanged -= OnPropertyValueChanged;
+
             objectProvider.ReturnReadOnlyProperty(_textProperty);
 
-            _textProperty.ValueChanged -= OnPropertyValueChanged;
             _textProperty = null;
 
             UpdateControlText(default);
diff --git a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UITK/BindableUIElements/BindableButton.cs b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UITK/BindableUIElements/BindableButton.cs
@@ -39,9 +39,10 @@ public virtual void ResetBindingContext(IObjectProvider objectProvider)
                 return;
             }
 
+            _command.CanExecuteChanged -= OnCommandCanExecuteChanged;
+
             objectProvider.ReturnCommandWrapper(_command, _commandBindingData);
 
-            _command.CanExecuteChanged -= OnCommandCanExecuteChanged;
             _command = null;
 
             clicked -= OnButtonClicked;
diff --git a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UITK/BindableUIElements/BindableLabel.cs b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UITK/BindableUIElements/BindableLabel.cs
@@ -33,9 +33,10 @@ public virtual void ResetBindingContext(IObjectProvider objectProvider)
                 return;
             }
 
+            _textProperty.ValueChanged -= OnPropertyValueChanged;
+
             objectProvider.ReturnReadOnlyProperty(_textProperty);
 
-            _textProperty.ValueChanged -= OnPropertyValueChanged;
             _textProperty = null;
 
             UpdateControlText(default);
diff --git a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UITK/BindableUIElements/BindableTextField.cs b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UITK/BindableUIElements/BindableTextField.cs
@@ -34,9 +34,10 @@ public virtual void ResetBindingContext(IObjectProvider objectProvider)
                 return;
             }
 
+            _valueProperty.ValueChanged -= OnPropertyValueChanged;
+
             objectProvider.ReturnProperty(_valueProperty);
 
-            _valueProperty.ValueChanged -= OnPropertyValueChanged;
             _valueProperty = null;
 
             this.UnregisterValueChangedCallback(OnControlValueChanged);

Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,10 @@ public void ResetBindingContext(IObjectProvider objectProvider)`
`40`	`40`	`return;`
`41`	`41`	`}`
`42`	`42`
	`43`	`+ _command.CanExecuteChanged -= OnCommandCanExecuteChanged;`
	`44`	`+`
`43`	`45`	`objectProvider.ReturnCommandWrapper(_command, _commandBindingData);`
`44`	`46`
`45`		`- _command.CanExecuteChanged -= OnCommandCanExecuteChanged;`
`46`	`47`	`_command = null;`
`47`	`48`
`48`	`49`	`_button.onClick.RemoveListener(OnButtonClicked);`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,10 @@ public void ResetBindingContext(IObjectProvider objectProvider)`
`33`	`33`	`return;`
`34`	`34`	`}`
`35`	`35`
	`36`	`+ _valueProperty.ValueChanged -= OnPropertyValueChanged;`
	`37`	`+`
`36`	`38`	`objectProvider.ReturnProperty(_valueProperty);`
`37`	`39`
`38`		`- _valueProperty.ValueChanged -= OnPropertyValueChanged;`
`39`	`40`	`_valueProperty = null;`
`40`	`41`
`41`	`42`	`_inputField.onValueChanged.RemoveListener(OnControlValueChanged);`
Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,10 @@ public virtual void ResetBindingContext(IObjectProvider objectProvider)`
`39`	`39`	`return;`
`40`	`40`	`}`
`41`	`41`
	`42`	`+ _command.CanExecuteChanged -= OnCommandCanExecuteChanged;`
	`43`	`+`
`42`	`44`	`objectProvider.ReturnCommandWrapper(_command, _commandBindingData);`
`43`	`45`
`44`		`- _command.CanExecuteChanged -= OnCommandCanExecuteChanged;`
`45`	`46`	`_command = null;`
`46`	`47`
`47`	`48`	`clicked -= OnButtonClicked;`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,10 @@ public virtual void ResetBindingContext(IObjectProvider objectProvider)`
`33`	`33`	`return;`
`34`	`34`	`}`
`35`	`35`
	`36`	`+ _textProperty.ValueChanged -= OnPropertyValueChanged;`
	`37`	`+`
`36`	`38`	`objectProvider.ReturnReadOnlyProperty(_textProperty);`
`37`	`39`
`38`		`- _textProperty.ValueChanged -= OnPropertyValueChanged;`
`39`	`40`	`_textProperty = null;`
`40`	`41`
`41`	`42`	`UpdateControlText(default);`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,10 @@ public virtual void ResetBindingContext(IObjectProvider objectProvider)`
`34`	`34`	`return;`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ _valueProperty.ValueChanged -= OnPropertyValueChanged;`
	`38`	`+`
`37`	`39`	`objectProvider.ReturnProperty(_valueProperty);`
`38`	`40`
`39`		`- _valueProperty.ValueChanged -= OnPropertyValueChanged;`
`40`	`41`	`_valueProperty = null;`
`41`	`42`
`42`	`43`	`this.UnregisterValueChangedCallback(OnControlValueChanged);`