Fix a bug in existing process detection

RaeesBhatti · Oct 23, 2016 · 26d3bb9 · 26d3bb9
1 parent 24efe7f
commit 26d3bb9
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Program.cs b/Program.cs
@@ -36,7 +36,7 @@ static void Main(string[] args)
             {
                 existingProcess = Process.GetProcessById(Convert.ToInt32(AgentPID));
             } catch (Exception) {}
-            if (String.IsNullOrEmpty(AgentPID) || (existingProcess != null && existingProcess.Id < 1))
+            if (String.IsNullOrEmpty(AgentPID) || existingProcess == null || existingProcess.Id < 1)
             {
                 AgentPID = Environment.GetEnvironmentVariable(SSH_AGENT_PID, EnvironmentVariableTarget.User);
             }
@@ -201,7 +201,7 @@ static void KillSSHAgent()
                 existingProcess = Process.GetProcessById(Convert.ToInt32(AgentPID));
             }
             catch (Exception) { }
-            if (String.IsNullOrEmpty(AgentPID) || (existingProcess != null && existingProcess.Id < 1))
+            if (String.IsNullOrEmpty(AgentPID) || existingProcess == null || existingProcess.Id < 1)
             {
                 Console.Error.WriteLine("Either the environment is currently not configured for ssh-agent or it " +
                                         "has already been killed.");
@@ -284,7 +284,7 @@ static bool TestSSHAgent()
             }
             catch (Exception) { }
 
-            return !(String.IsNullOrEmpty(AgentPID) || (existingProcess != null && existingProcess.Id < 1));
+            return !(String.IsNullOrEmpty(AgentPID) || existingProcess == null || existingProcess.Id < 1);
         }
 
         static string FindProgram(string name)