github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-16 10:03:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

NPR Exception fixes.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
Greenshot/Drawing/DrawableContainer.cs
View file

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

5
Greenshot/Drawing/Surface.cs
View file

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