Fixes needed after merge

StanleyGoldman · StanleyGoldman · commit d86c1629897f · 2017-11-09T12:54:34.000-05:00
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs
@@ -63,16 +63,12 @@ public override void OnGUI()
                                          if (Repository != null)
                                          {
                                              Repository.User.Name = gitName = newGitName;
-                                             Repository.User.Email = newGitEmail;
+                                             Repository.User.Email = gitEmail = newGitEmail;
                                          }
                                          else
                                          {
-                                             if (cachedUser == null)
-                                             {
-                                                 cachedUser = new User();
-                                             }
-                                             cachedUser.Name = newGitName;
-                                             cachedUser.Email = newGitEmail;
+                                             gitName = newGitName;
+                                             gitEmail = newGitEmail;
                                          }
 
                                          Redraw();

Original file line number	Diff line number	Diff line change
`@@ -63,16 +63,12 @@ public override void OnGUI()`
`63`	`63`	`if (Repository != null)`
`64`	`64`	`{`
`65`	`65`	`Repository.User.Name = gitName = newGitName;`
`66`		`- Repository.User.Email = newGitEmail;`
	`66`	`+ Repository.User.Email = gitEmail = newGitEmail;`
`67`	`67`	`}`
`68`	`68`	`else`
`69`	`69`	`{`
`70`		`- if (cachedUser == null)`
`71`		`- {`
`72`		`- cachedUser = new User();`
`73`		`- }`
`74`		`- cachedUser.Name = newGitName;`
`75`		`- cachedUser.Email = newGitEmail;`
	`70`	`+ gitName = newGitName;`
	`71`	`+ gitEmail = newGitEmail;`
`76`	`72`	`}`
`77`	`73`
`78`	`74`	`Redraw();`