From 6f64d789eca748a19d2165e6d6c71258236e9107 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Tue, 3 Aug 2010 18:24:48 +0200 Subject: [PATCH] Cleanup FormMailMap. --- GitUI/FormMailMap.cs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/GitUI/FormMailMap.cs b/GitUI/FormMailMap.cs index b0a7023b4..16872cb92 100644 --- a/GitUI/FormMailMap.cs +++ b/GitUI/FormMailMap.cs @@ -18,16 +18,14 @@ namespace GitUI try { - if (File.Exists(Settings.WorkingDir + ".mailmap")) - { - using (var re = new StreamReader(Settings.WorkingDir + ".mailmap", Settings.Encoding)) - { + var mailMap = Settings.WorkingDir + ".mailmap"; + if (File.Exists(mailMap)) + using (var re = new StreamReader(mailMap, Settings.Encoding)) MailMapFile = re.ReadToEnd(); - } - } + _MailMapText.Text = MailMapFile; } - catch(Exception ex) + catch (Exception ex) { Trace.WriteLine(ex.Message); } @@ -44,9 +42,7 @@ namespace GitUI // that causes the first line to include 3 extra bytes. (encoding marker??) MailMapFile = Environment.NewLine + _MailMapText.Text.Trim(); using (TextWriter tw = new StreamWriter(x, false, Settings.Encoding)) - { tw.Write(MailMapFile); - } Close(); }); }