Show message box when cannot find git binary instead of crash. Add x6…

…4 git binary path
zelon · Jun 8, 2016 · 884c9fd · 884c9fd
1 parent d5811b2
commit 884c9fd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/WimyGit/ProgramPathFinder.cs b/WimyGit/ProgramPathFinder.cs
@@ -12,6 +12,7 @@ public static string GetGitBin()
         {
             string[] git_path_candidates =
             {
+                @"C:\Program Files\Git\bin\git.exe",
                 @"C:\Program Files (x86)\Git\bin\git.exe",
                 @"C:\Users\" + Environment.UserName + @"\AppData\Local\Programs\Git\bin\git.exe",
             };
@@ -23,7 +24,7 @@ public static string GetGitBin()
                     return path;
                 }
             }
-            throw new Exception("Cannot find git binary");
+            throw new System.IO.FileNotFoundException("Cannot find git binary");
         }
 
         public static string GetGitShell()

diff --git a/WimyGit/ViewModel.cs b/WimyGit/ViewModel.cs
@@ -59,9 +59,17 @@ public void OnChangeDirectory(object parameter)
             git_ = new GitWrapper(Directory);
 
             Service.GetInstance().SetRootPath(Directory);
-            Refresh();
 
-            DirectoryUsed(Directory);
+            try
+            {
+                Refresh();
+                DirectoryUsed(Directory);
+            }
+            catch (System.IO.FileNotFoundException ex)
+            {
+                Service.GetInstance().ShowMsg(ex.Message);
+                System.Environment.Exit(1);
+            }
         }
 
         public void Refresh()