Skip to content

Commit a7423f1

Browse files
committed
Merge branch 'develop'
2 parents 1797249 + 734b755 commit a7423f1

1 file changed

Lines changed: 12 additions & 4 deletions

File tree

Stellar.Maui/Extensions/PickerExtensions.cs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -437,13 +437,21 @@ private void SetSelectedItem(bool fromNotificationTrigger = false)
437437

438438
private void SelectedItemChanged(TViewModel? item, bool fromUi = false)
439439
{
440-
_selectedItemChanged?.Invoke(item);
440+
var picker = _picker;
441+
442+
if (picker is null)
443+
{
444+
return;
445+
}
446+
447+
picker.Dispatcher?.Dispatch(() => _selectedItemChanged?.Invoke(item));
441448

442-
if (!fromUi && _picker is not null && (_picker.SelectedItem is null || !EqualityComparer<TViewModel>.Default.Equals(item, this.SelectedItem)))
449+
if (fromUi || (_picker.SelectedItem is not null && EqualityComparer<TViewModel>.Default.Equals(item, this.SelectedItem)))
443450
{
444-
var picker = _picker;
445-
picker?.Dispatcher?.Dispatch(() => picker.SelectedItem = item);
451+
return;
446452
}
453+
454+
picker.Dispatcher?.Dispatch(() => picker.SelectedItem = item);
447455
}
448456

449457
public void Dispose()

0 commit comments

Comments
 (0)