Finished merge.

This commit is contained in:
Robin 2016-08-16 17:06:09 +02:00
parent bca9051858
commit a38929aa84

View file

@ -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);