Merge branch 'fixes/additional-npath-stuff' into features/octorun-js

StanleyGoldman · StanleyGoldman · commit 7aa8034628be · 2018-03-08T12:53:12.000-05:00
diff --git a/src/GitHub.Api/Application/ApplicationManagerBase.cs b/src/GitHub.Api/Application/ApplicationManagerBase.cs
@@ -62,7 +62,7 @@ public void Run(bool firstRun)
                 var initEnvironmentTask = new ActionTask<NPath>(CancellationToken, (_, path) => InitializeEnvironment(path, octorunScriptPath)) { Affinity = TaskAffinity.UI };
                 var findExecTask = new FindExecTask("git", CancellationToken)
                     .FinallyInUI((b, ex, path) => {
-                        if (b && path != NPath.Default)
+                        if (b && path.IsInitialized)
                         {
                             Logger.Trace("FindExecTask Success: {0}", path);
                             InitializeEnvironment(path, octorunScriptPath);

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public void Run(bool firstRun)`
`62`	`62`	`var initEnvironmentTask = new ActionTask<NPath>(CancellationToken, (_, path) => InitializeEnvironment(path, octorunScriptPath)) { Affinity = TaskAffinity.UI };`
`63`	`63`	`var findExecTask = new FindExecTask("git", CancellationToken)`
`64`	`64`	`.FinallyInUI((b, ex, path) => {`
`65`		`- if (b && path != NPath.Default)`
	`65`	`+ if (b && path.IsInitialized)`
`66`	`66`	`{`
`67`	`67`	`Logger.Trace("FindExecTask Success: {0}", path);`
`68`	`68`	`InitializeEnvironment(path, octorunScriptPath);`