Merge branch 'fixes/set-name-email-refresh-error' into enhancements/user-settings-view

StanleyGoldman · StanleyGoldman · commit 89569bc9404b · 2017-09-05T11:20:29.000-04:00
# Conflicts:
#	src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs
@@ -60,15 +60,15 @@ public override void OnGUI()
                                      {
                                          if (Repository != null)
                                          {
-                                             Repository.User.Name = value;
+                                             Repository.User.Name = newGitName;
                                          }
                                          else
                                          {
                                              if (cachedUser == null)
                                              {
                                                  cachedUser = new User();
                                              }
-                                             cachedUser.Name = value;
+                                             cachedUser.Name = newGitName;
                                          }
                                      }
                                  })
@@ -80,13 +80,14 @@ public override void OnGUI()
                                                   {
                                                       if (Repository != null)
                                                       {
-                                                          Repository.User.Email = value;
+                                                          Repository.User.Email = newGitEmail;
                                                       }
                                                       else
                                                       {
-                                                          cachedUser.Email = value;
-                                                          userDataHasChanged = true;
+                                                          cachedUser.Email = newGitEmail;
                                                       }
+
+                                                      userDataHasChanged = true;
                                                   }
                                               }))
                                  .FinallyInUI((_, __) =>

Original file line number	Diff line number	Diff line change
`@@ -60,15 +60,15 @@ public override void OnGUI()`
`60`	`60`	`{`
`61`	`61`	`if (Repository != null)`
`62`	`62`	`{`
`63`		`- Repository.User.Name = value;`
	`63`	`+ Repository.User.Name = newGitName;`
`64`	`64`	`}`
`65`	`65`	`else`
`66`	`66`	`{`
`67`	`67`	`if (cachedUser == null)`
`68`	`68`	`{`
`69`	`69`	`cachedUser = new User();`
`70`	`70`	`}`
`71`		`- cachedUser.Name = value;`
	`71`	`+ cachedUser.Name = newGitName;`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`})`
`@@ -80,13 +80,14 @@ public override void OnGUI()`
`80`	`80`	`{`
`81`	`81`	`if (Repository != null)`
`82`	`82`	`{`
`83`		`- Repository.User.Email = value;`
	`83`	`+ Repository.User.Email = newGitEmail;`
`84`	`84`	`}`
`85`	`85`	`else`
`86`	`86`	`{`
`87`		`- cachedUser.Email = value;`
`88`		`- userDataHasChanged = true;`
	`87`	`+ cachedUser.Email = newGitEmail;`
`89`	`88`	`}`
	`89`	`+`
	`90`	`+ userDataHasChanged = true;`
`90`	`91`	`}`
`91`	`92`	`}))`
`92`	`93`	`.FinallyInUI((_, __) =>`