Search for multirust before searching global official install path

vosen · vosen · commit 700b6b6742b2 · 2016-03-06T12:53:30.000+01:00
diff --git a/VisualRust.Shared/Environment.cs b/VisualRust.Shared/Environment.cs
@@ -85,17 +85,17 @@ private static IEnumerable<string> GetAllInstallPaths()
             {
                 return GetInstallRoots(RegistryHive.CurrentUser, RegistryView.Registry64)
                     .Union(GetInstallRoots(RegistryHive.CurrentUser, RegistryView.Registry32))
+                    .Union(new string[] { GetMultirustInstallRoot() })
                     .Union(GetInstallRoots(RegistryHive.LocalMachine, RegistryView.Registry64))
                     .Union(GetInstallRoots(RegistryHive.LocalMachine, RegistryView.Registry32))
-                    .Union(GetInnoInstallRoot())
-                    .Union(new string[] { GetMultirustInstallRoot() });
+                    .Union(GetInnoInstallRoot());
             }
             else
             {
                 return GetInstallRoots(RegistryHive.CurrentUser, RegistryView.Registry32)
+                    .Union(new string[] { GetMultirustInstallRoot() })
                     .Union(GetInstallRoots(RegistryHive.LocalMachine, RegistryView.Registry32))
-                    .Union(GetInnoInstallRoot())
-                    .Union(new string[] { GetMultirustInstallRoot() });
+                    .Union(GetInnoInstallRoot());
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -85,17 +85,17 @@ private static IEnumerable<string> GetAllInstallPaths()`
`85`	`85`	`{`
`86`	`86`	`return GetInstallRoots(RegistryHive.CurrentUser, RegistryView.Registry64)`
`87`	`87`	`.Union(GetInstallRoots(RegistryHive.CurrentUser, RegistryView.Registry32))`
	`88`	`+ .Union(new string[] { GetMultirustInstallRoot() })`
`88`	`89`	`.Union(GetInstallRoots(RegistryHive.LocalMachine, RegistryView.Registry64))`
`89`	`90`	`.Union(GetInstallRoots(RegistryHive.LocalMachine, RegistryView.Registry32))`
`90`		`- .Union(GetInnoInstallRoot())`
`91`		`- .Union(new string[] { GetMultirustInstallRoot() });`
	`91`	`+ .Union(GetInnoInstallRoot());`
`92`	`92`	`}`
`93`	`93`	`else`
`94`	`94`	`{`
`95`	`95`	`return GetInstallRoots(RegistryHive.CurrentUser, RegistryView.Registry32)`
	`96`	`+ .Union(new string[] { GetMultirustInstallRoot() })`
`96`	`97`	`.Union(GetInstallRoots(RegistryHive.LocalMachine, RegistryView.Registry32))`
`97`		`- .Union(GetInnoInstallRoot())`
`98`		`- .Union(new string[] { GetMultirustInstallRoot() });`
	`98`	`+ .Union(GetInnoInstallRoot());`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`