Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit f441bbd

Browse files
authored
Merge pull request #312 from github-for-unity/fixes/settings-view-locks-update
Updating lockedFiles when switching to SettingsView
2 parents c83aff9 + a10c97a commit f441bbd

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ class SettingsView : Subview
4747
[SerializeField] private bool hasRemote;
4848
[NonSerialized] private bool remoteHasChanged;
4949
[NonSerialized] private bool userDataHasChanged;
50+
[NonSerialized] private bool locksHaveChanged;
5051

5152
[SerializeField] private string newGitName;
5253
[SerializeField] private string newGitEmail;
@@ -63,6 +64,7 @@ public override void OnEnable()
6364

6465
remoteHasChanged = true;
6566
metricsHasChanged = true;
67+
locksHaveChanged = true;
6668
}
6769

6870
public override void OnDisable()
@@ -186,7 +188,7 @@ private void MaybeUpdateData()
186188

187189
userDataHasChanged = Repository.User.Name != gitName || Repository.User.Email != gitEmail;
188190

189-
if (!remoteHasChanged && !userDataHasChanged)
191+
if (!remoteHasChanged && !userDataHasChanged && !locksHaveChanged)
190192
return;
191193

192194
if (userDataHasChanged)
@@ -212,6 +214,12 @@ private void MaybeUpdateData()
212214
newRepositoryRemoteUrl = repositoryRemoteUrl = activeRemote.Value.Url;
213215
}
214216
}
217+
218+
if (locksHaveChanged)
219+
{
220+
locksHaveChanged = false;
221+
lockedFiles = Repository.CurrentLocks.ToList();
222+
}
215223
}
216224

217225
private void Repository_OnActiveRemoteChanged(string remote)

0 commit comments

Comments
 (0)