Updating .NET path manipulation when launching Firefox process

Fixes issue SeleniumHQ#6418.
paymand · Oct 24, 2013 · d466afc · d466afc
1 parent 0ae18aa
commit d466afc
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/dotnet/src/webdriver/Firefox/Internal/Executable.cs b/dotnet/src/webdriver/Firefox/Internal/Executable.cs
@@ -105,19 +105,21 @@ public void SetLibraryPath(Process builder)
             // Check our extra env vars for the same var, and use it too.
             if (builder.StartInfo.EnvironmentVariables.ContainsKey(propertyName))
             {
-                libraryPath.Append(env).Append(Path.PathSeparator);
+                libraryPath.Append(builder.StartInfo.EnvironmentVariables[propertyName]).Append(Path.PathSeparator);
             }
 
             // Last, add the contents of the specified system property, defaulting to the binary's path.
             // On Snow Leopard, beware of problems the sqlite library    
             string firefoxLibraryPath = Path.GetFullPath(this.binaryLocation);
             if (Platform.CurrentPlatform.IsPlatformType(PlatformType.Mac) && Platform.CurrentPlatform.MinorVersion > 5)
             {
-                libraryPath.Append(libraryPath).Append(Path.PathSeparator);
+                libraryPath.Append(Path.PathSeparator);
             }
             else
             {
-                libraryPath.Append(firefoxLibraryPath).Append(Path.PathSeparator).Append(libraryPath);
+                // Insert the Firefox library path and the path separator at the beginning
+                // of the path.
+                libraryPath.Insert(0, Path.PathSeparator).Insert(0, firefoxLibraryPath);
             }
 
             // Add the library path to the builder.