Browse Source

Merge pull request #79 from gumme/WpfDesignerPointerBugFix

Fixed SD-1931 - Dragging Pointer from toolbox to WPF designer throws exception.
pull/263/head
Siegfried Pammer 12 years ago
parent
commit
aef0b59068
  1. 8
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfToolbox.cs

8
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfToolbox.cs

@ -183,7 +183,13 @@ namespace ICSharpCode.WpfDesign.AddIn @@ -183,7 +183,13 @@ namespace ICSharpCode.WpfDesign.AddIn
if (this.ActiveTab.ChoosedItem != draggedItem && this.ActiveTab.Items.Contains(draggedItem)) {
this.ActiveTab.ChoosedItem = draggedItem;
}
return new System.Windows.DataObject(draggedItem.Tag);
if (draggedItem.Tag != null) {
return new System.Windows.DataObject(draggedItem.Tag);
}
else {
return new System.Windows.DataObject();
}
}
}
}

Loading…
Cancel
Save