From a38929aa84ced760e937c53b72f17f6aa8a1d693 Mon Sep 17 00:00:00 2001
From: Robin <robin@getgreenshot.org>
Date: Tue, 16 Aug 2016 17:06:09 +0200
Subject: [PATCH] Finished merge.

---
 Greenshot/Drawing/TextContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Greenshot/Drawing/TextContainer.cs b/Greenshot/Drawing/TextContainer.cs
index 3557bcf52..2fe2e2425 100644
--- a/Greenshot/Drawing/TextContainer.cs
+++ b/Greenshot/Drawing/TextContainer.cs
@@ -383,7 +383,7 @@ namespace Greenshot.Drawing
 					_font = newFont;
 					_textBox.Font = _font;
 				}
-				catch (Exception ex2)
+				catch (Exception)
 				{
 					// When this happens... the PC is broken
 					ex.Data.Add("fontFamily", fontFamily);