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

Commit c70857d

Browse files
Fixing display of name and email
1 parent 14cc5f9 commit c70857d

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/GitHub.Api/Git/RepositoryManager.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,8 @@ private void LoadGitUser()
313313
.Then((success, value) => user.Name = value).Then(
314314
GitClient.GetConfig("user.email", GitConfigSource.User)
315315
.Then((success, value) => user.Email = value))
316-
.Then(() => OnGitUserLoaded?.Invoke(user));
316+
.Then(() => OnGitUserLoaded?.Invoke(user))
317+
.Start();
317318
}
318319

319320
private void SetupWatcher()

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,11 @@ private void MaybeUpdateData()
172172
if (lockedFiles == null)
173173
lockedFiles = new List<GitLock>();
174174

175-
userDataHasChanged = Repository == null || (Repository.User.Name == gitName && Repository.User.Email == gitEmail);
176-
177175
if (Repository == null)
178176
return;
179177

178+
userDataHasChanged = !(Repository.User.Name == gitName && Repository.User.Email == gitEmail);
179+
180180
if (!remoteHasChanged && !userDataHasChanged)
181181
return;
182182

@@ -196,7 +196,7 @@ private void MaybeUpdateData()
196196
}
197197
}
198198

199-
if (userDataHasChanged && Repository != null)
199+
if (userDataHasChanged)
200200
{
201201
gitName = Repository.User.Name;
202202
gitEmail = Repository.User.Email;
@@ -243,8 +243,8 @@ private void OnUserSettingsGUI()
243243

244244
EditorGUI.BeginDisabledGroup(isBusy);
245245
{
246-
newGitName = EditorGUILayout.TextField(GitConfigNameLabel, newGitName);
247-
newGitEmail = EditorGUILayout.TextField(GitConfigEmailLabel, newGitEmail);
246+
newGitName = EditorGUILayout.TextField(GitConfigNameLabel, gitName);
247+
newGitEmail = EditorGUILayout.TextField(GitConfigEmailLabel, gitEmail);
248248

249249
var needsSaving = newGitName != gitName || newGitEmail != gitEmail;
250250
EditorGUI.BeginDisabledGroup(needsSaving);

0 commit comments

Comments
 (0)