fix: Crash when suggest merge/diff tool paths

If merge/diff tool paths enclosed in quotes, clicking on "Suggest" button would crash the app. Strip quotes from paths before attempting to suggest. Fixes gitextensions#7000
RussKie · Aug 22, 2019 · 504c6a1 · 504c6a1
1 parent 6de714b
commit 504c6a1
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/GitConfigSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/GitConfigSettingsPage.cs
@@ -160,12 +160,14 @@ private void MergeToolCmdSuggest_Click(object sender, EventArgs e)
                 return;
             }
 
-            CurrentSettings.SetPathValue(string.Format("mergetool.{0}.path", _NO_TRANSLATE_GlobalMergeTool.Text.Trim()), MergetoolPath.Text?.Trim() ?? "");
+            var mergeToolPath = MergetoolPath.Text.Trim().Trim('"', '\'');
+
+            CurrentSettings.SetPathValue(string.Format("mergetool.{0}.path", _NO_TRANSLATE_GlobalMergeTool.Text.Trim()), mergeToolPath ?? "");
             string exeName;
             string exeFile;
-            if (!string.IsNullOrEmpty(MergetoolPath.Text))
+            if (!string.IsNullOrEmpty(mergeToolPath))
             {
-                exeFile = MergetoolPath.Text;
+                exeFile = mergeToolPath;
                 exeName = Path.GetFileName(exeFile);
             }
             else
@@ -218,12 +220,14 @@ private void DiffToolCmdSuggest_Click(object sender, EventArgs e)
                 return;
             }
 
-            CurrentSettings.SetPathValue(string.Format("difftool.{0}.path", _NO_TRANSLATE_GlobalDiffTool.Text.Trim()), DifftoolPath.Text?.Trim() ?? "");
+            var diffToolPath = DifftoolPath.Text.Trim().Trim('"', '\'');
+
+            CurrentSettings.SetPathValue(string.Format("difftool.{0}.path", _NO_TRANSLATE_GlobalDiffTool.Text.Trim()), diffToolPath ?? "");
             string exeName;
             string exeFile;
-            if (!string.IsNullOrEmpty(DifftoolPath.Text))
+            if (!string.IsNullOrEmpty(diffToolPath))
             {
-                exeFile = DifftoolPath.Text;
+                exeFile = diffToolPath;
                 exeName = Path.GetFileName(exeFile);
             }
             else