Merge commit 'd4c708bdc60a631ece071ab11ed59c10207b31aa' into windows

Conflicts:
	SparkleShare/SparkleControllerBase.cs
This commit is contained in:
wimh 2011-11-04 23:05:45 +01:00
commit d4f01aa590

View file

@ -1152,6 +1152,14 @@ namespace SparkleShare {
Environment.Exit (0);
#else
System.Windows.Forms.Application.Exit ();
// Also kill the SSH_AGENT that we started
try {
int pid = Int32.Parse (System.Environment.GetEnvironmentVariable ("SSH_AGENT_PID"));
Process.GetProcessById (pid).Kill ();
} catch (ArgumentException) {
SparkleHelpers.DebugInfo ("SSH", "Could not kill the ssh-agent, due to the process wasn't running");
}
#endif
}