Merge branch 'master' into fixes/update-server

StanleyGoldman · web-flow · commit 82624ae9f4d5 · 2018-05-15T17:01:40.000-04:00
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs
@@ -279,6 +279,8 @@ private void MaybeUpdateData()
             {
                 if (repoBranch == null || repoRemote == null || currentBranchAndRemoteHasUpdate)
                 {
+                    currentBranchAndRemoteHasUpdate = false;
+
                     var repositoryCurrentBranch = Repository.CurrentBranch;
                     var updatedRepoBranch = repositoryCurrentBranch.HasValue ? repositoryCurrentBranch.Value.Name : null;
 

Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,8 @@ private void MaybeUpdateData()`
`279`	`279`	`{`
`280`	`280`	`if (repoBranch == null \|\| repoRemote == null \|\| currentBranchAndRemoteHasUpdate)`
`281`	`281`	`{`
	`282`	`+ currentBranchAndRemoteHasUpdate = false;`
	`283`	`+`
`282`	`284`	`var repositoryCurrentBranch = Repository.CurrentBranch;`
`283`	`285`	`var updatedRepoBranch = repositoryCurrentBranch.HasValue ? repositoryCurrentBranch.Value.Name : null;`
`284`	`286`