github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-19 21:13:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

BUG-2013 : This might fix the NRE as the events might not be in line with the cleaning up...

Browse source
This commit is contained in:
Robin 2016-08-20 10:52:59 +02:00
commit d40461ec47
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Greenshot/Drawing/TextContainer.cs
View file

@ -205,6 +205,10 @@ namespace Greenshot.Drawing
void TextContainer_FieldChanged(object sender, FieldChangedEventArgs e) void TextContainer_FieldChanged(object sender, FieldChangedEventArgs e)
{ {
if (_textBox == null)
{
return;
}
if (_textBox.Visible) if (_textBox.Visible)
{ {
_textBox.Invalidate(); _textBox.Invalidate();
@ -225,7 +229,7 @@ namespace Greenshot.Drawing
} }
UpdateTextBoxFormat(); UpdateTextBoxFormat();
if (_textBox != null && _textBox.Visible) if (_textBox.Visible)
{ {
_textBox.Invalidate(); _textBox.Invalidate();
} }
@ -360,6 +364,10 @@ namespace Greenshot.Drawing
/// </summary> /// </summary>
protected void UpdateFormat() protected void UpdateFormat()
{ {
if (_textBox == null)
{
return;
}
string fontFamily = GetFieldValueAsString(FieldType.FONT_FAMILY); string fontFamily = GetFieldValueAsString(FieldType.FONT_FAMILY);
bool fontBold = GetFieldValueAsBool(FieldType.FONT_BOLD); bool fontBold = GetFieldValueAsBool(FieldType.FONT_BOLD);
bool fontItalic = GetFieldValueAsBool(FieldType.FONT_ITALIC); bool fontItalic = GetFieldValueAsBool(FieldType.FONT_ITALIC);
@ -441,7 +449,7 @@ namespace Greenshot.Drawing
{ {
return; return;
} }
StringAlignment alignment = (StringAlignment)GetFieldValue(FieldType.TEXT_HORIZONTAL_ALIGNMENT); var alignment = (StringAlignment)GetFieldValue(FieldType.TEXT_HORIZONTAL_ALIGNMENT);
switch (alignment) switch (alignment)
{ {
case StringAlignment.Near: case StringAlignment.Near:
@ -455,7 +463,7 @@ namespace Greenshot.Drawing
break; break;
} }
Color lineColor = GetFieldValueAsColor(FieldType.LINE_COLOR); var lineColor = GetFieldValueAsColor(FieldType.LINE_COLOR);
_textBox.ForeColor = lineColor; _textBox.ForeColor = lineColor;
} }