Skip to content

Commit e0dad54

Browse files
author
Stewart Miles
committed
Merge remote-tracking branch 'origin/master' into upstream
Change-Id: I15afea81fafe0ff41f2cfec4d9d89e0059367af6
2 parents 138a575 + 4bed53b commit e0dad54

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

source/VersionHandlerImpl/src/ProjectSettings.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,15 @@ private static void Save() {
406406
return;
407407
}
408408
Directory.CreateDirectory(Path.GetDirectoryName(PROJECT_SETTINGS_FILE));
409+
if (UnityEditor.VersionControl.Provider.enabled && UnityEditor.VersionControl.Provider.isActive &&
410+
(!UnityEditor.VersionControl.Provider.requiresNetwork ||
411+
UnityEditor.VersionControl.Provider.onlineState == UnityEditor.VersionControl.OnlineState.Online)) {
412+
var task = UnityEditor.VersionControl.Provider.Checkout(PROJECT_SETTINGS_FILE,
413+
UnityEditor.VersionControl.CheckoutMode.Exact);
414+
task.Wait();
415+
if (!task.success)
416+
return;
417+
}
409418
using (var writer = new XmlTextWriter(new StreamWriter(PROJECT_SETTINGS_FILE)) {
410419
Formatting = Formatting.Indented,
411420
}) {

0 commit comments

Comments
 (0)