From ca0095491b65b5b6b76759ace0d4e9c750afe4dd Mon Sep 17 00:00:00 2001 From: Robin Krom Date: Thu, 6 Aug 2020 17:02:26 +0200 Subject: [PATCH] Fixed an issue which was described in #217, also did some hardening that it doesn't happen on other locations in the TextContainer. --- Greenshot/Drawing/TextContainer.cs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Greenshot/Drawing/TextContainer.cs b/Greenshot/Drawing/TextContainer.cs index 939dd3de6..ddfb2918e 100644 --- a/Greenshot/Drawing/TextContainer.cs +++ b/Greenshot/Drawing/TextContainer.cs @@ -158,9 +158,15 @@ namespace Greenshot.Drawing protected override void SwitchParent(Surface newParent) { - _parent.SizeChanged -= Parent_SizeChanged; + if (_parent != null) + { + _parent.SizeChanged -= Parent_SizeChanged; + } base.SwitchParent(newParent); - _parent.SizeChanged += Parent_SizeChanged; + if (_parent != null) + { + _parent.SizeChanged += Parent_SizeChanged; + } } private void Parent_SizeChanged(object sender, EventArgs e) @@ -320,8 +326,12 @@ namespace Greenshot.Drawing private void HideTextBox() { - _parent.Focus(); + _parent?.Focus(); _textBox?.Hide(); + if (_parent == null) + { + return; + } _parent.KeysLocked = false; _parent.Controls.Remove(_textBox); }