Handling exceptions

wakatime · May 15, 2016 · f72ed35 · f72ed35
1 parent 011abc8
commit f72ed35
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/PythonManager.cs b/PythonManager.cs
@@ -33,23 +33,29 @@ static string GetPathFromMicrosoftRegister()
             {
                 var regex = new Regex(@"""([^""]*)\\([^""\\]+(?:\.[^"".\\]+))""");
                 var pythonKey = Registry.ClassesRoot.OpenSubKey(@"Python.File\shell\open\command");
-                var python = pythonKey.GetValue(null).ToString();
-                var match = regex.Match(python);
+                if (pythonKey != null)
+                {
+                    var python = pythonKey.GetValue(null).ToString();
+                    var match = regex.Match(python);
 
-                if (!match.Success) return null;
+                    if (!match.Success) return null;
 
-                var directory = match.Groups[1].Value;
-                var fullPath = Path.Combine(directory, "pythonw");
-                var process = new RunProcess(fullPath, "--version");
+                    var directory = match.Groups[1].Value;
+                    var fullPath = Path.Combine(directory, "pythonw");
+                    var process = new RunProcess(fullPath, "--version");
 
-                process.Run();
+                    process.Run();
 
-                if (!process.Success)
-                    return null;
+                    if (!process.Success)
+                        return null;
 
-                Logger.Debug(string.Format("Python found by Microsoft Register: {0}", fullPath));
+                    Logger.Debug(string.Format("Python found by Microsoft Register: {0}", fullPath));
 
-                return fullPath;
+                    return fullPath;
+                }
+
+                Logger.Info("There's no Python path from Micforost Register");
+                return null;
             }
             catch (Exception ex)
             {

diff --git a/WakaTime.cs b/WakaTime.cs
@@ -115,7 +115,7 @@ public void OnConnection(object application, ext_ConnectMode connectMode, object
                     }
                     else
                         MessageBox.Show(
-                            @"Please install Python (https://www.python.org/downloads/) and restart Visual Studio to enable the WakaTime plugin.",
+                            @"Please install Python (https://www.python.org/downloads/) and restart SQL Server Management Studio to enable the WakaTime plugin.",
                             @"WakaTime", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 }