diff --git a/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs index 4c0b516a..ed8b4ab8 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs @@ -239,6 +239,7 @@ namespace HandyControl.Controls } _panel.Children.Clear(); + var dataContext = DataContext; foreach (var item in SelectedItems) { @@ -250,7 +251,15 @@ namespace HandyControl.Controls Tag = checkComboBoxItem }; - tag.SetBinding(ContentControl.ContentProperty, new Binding(DisplayMemberPath) { Source = item }); + if (dataContext != null) + { + tag.SetBinding(ContentControl.ContentProperty, new Binding(DisplayMemberPath) { Source = item }); + } + else + { + tag.Content = checkComboBoxItem.Content; + } + _panel.Children.Add(tag); } }