NPR Exception fixes.

This commit is contained in:
Robin 2016-06-16 21:56:54 +02:00
parent 9fe00fdbdb
commit aa3df02e3f
2 changed files with 5 additions and 2 deletions

View file

@ -484,7 +484,7 @@ namespace Greenshot.Drawing
{
return;
}
_parent.FieldAggregator?.UnbindElement(this);
_parent?.FieldAggregator?.UnbindElement(this);
_parent = newParent;
foreach(IFilter filter in Filters) {

View file

@ -1618,7 +1618,10 @@ namespace Greenshot.Drawing
{
element.FieldChanged -= element_FieldChanged;
}
element.Parent = null;
if (elementToRemove != null)
{
elementToRemove.Parent = null;
}
// Do not dispose, the memento should!! element.Dispose();
if (invalidate)
{