GlobalSettings.NativeLibraryPath: throw once used

Author: Edward Thomson

LibGit2Sharp/Core/NativeMethods.cs

@@ -66,7 +66,9 @@ static NativeMethods()
         {
             if (Platform.OperatingSystem == OperatingSystemType.Windows)
             {
-                string path = Path.Combine(GlobalSettings.NativeLibraryPath, Platform.ProcessorArchitecture);
+                string nativeLibraryPath = GlobalSettings.GetAndLockNativeLibraryPath();
+
+                string path = Path.Combine(nativeLibraryPath, Platform.ProcessorArchitecture);
 
                 const string pathEnvVariable = "PATH";
                 Environment.SetEnvironmentVariable(pathEnvVariable,

LibGit2Sharp/GlobalSettings.cs

@@ -15,6 +15,7 @@ public static class GlobalSettings
         private static LogConfiguration logConfiguration = LogConfiguration.None;
 
         private static string nativeLibraryPath;
+        private static bool nativeLibraryPathLocked;
 
         static GlobalSettings()
         {
@@ -154,8 +155,19 @@ public static string NativeLibraryPath
                     throw new LibGit2SharpException("Setting the native hint path is only supported on Windows platforms");
                 }
 
+                if (nativeLibraryPathLocked)
+                {
+                    throw new LibGit2SharpException("You cannot set the native library path after it has been loaded");
+                }
+
                 nativeLibraryPath = value;
             }
         }
+
+        internal static string GetAndLockNativeLibraryPath()
+        {
+            nativeLibraryPathLocked = true;
+            return nativeLibraryPath;
+        }
     }
 }