github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-14 02:37:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing some NPR Exceptions.

Browse source
This commit is contained in:
Robin 2016-06-16 21:35:32 +02:00
commit 9fe00fdbdb
4 changed files with 24 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Greenshot/Drawing/DrawableContainer.cs
View file

@ -89,14 +89,7 @@ namespace Greenshot.Drawing
if (!disposing) {
return;
}
if (_parent != null)
{
FieldAggregator fieldAggregator = _parent.FieldAggregator;
if (fieldAggregator != null)
{
fieldAggregator.UnbindElement(this);
}
}
_parent?.FieldAggregator?.UnbindElement(this);
}
~DrawableContainer() {
@ -306,7 +299,7 @@ namespace Greenshot.Drawing
public virtual void Invalidate() {
if (Status != EditStatus.UNDRAWN) {
_parent.Invalidate(DrawingBounds);
_parent?.Invalidate(DrawingBounds);
}
}
@ -491,15 +484,7 @@ namespace Greenshot.Drawing
{
return;
}
if (_parent != null)
{
// Remove FieldAggregator
FieldAggregator fieldAggregator = _parent.FieldAggregator;
if (fieldAggregator != null)
{
fieldAggregator.UnbindElement(this);
}
}
_parent.FieldAggregator?.UnbindElement(this);
_parent = newParent;
foreach(IFilter filter in Filters) {
@ -521,7 +506,7 @@ namespace Greenshot.Drawing
/// <param name="fieldToBeChanged">The field to be changed</param>
/// <param name="newValue">The new value</param>
public virtual void BeforeFieldChange(IField fieldToBeChanged, object newValue) {
_parent.MakeUndoable(new ChangeFieldHolderMemento(this, fieldToBeChanged), true);
_parent?.MakeUndoable(new ChangeFieldHolderMemento(this, fieldToBeChanged), true);
Invalidate();
}