From b5578b3816904c024c746da2b8e29c49f297be85 Mon Sep 17 00:00:00 2001
From: Yuki Osaki <yuki.osaki7@gmail.com>
Date: Fri, 19 Aug 2022 13:07:10 +0900
Subject: [PATCH] fix reload issue

---
 pkg/gui/branches_panel.go | 21 ++++++++++++++++-----
 pkg/gui/refresh.go        |  6 +++++-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go
index ad3fc1947..40fb8dc89 100644
--- a/pkg/gui/branches_panel.go
+++ b/pkg/gui/branches_panel.go
@@ -24,14 +24,23 @@ func (gui *Gui) branchesRenderToMain() error {
 	})
 }
 
-func (gui *Gui) refreshGithubPullRequests() {
+func (gui *Gui) refreshGithubPullRequests() error {
 	if err := gui.git.Gh.BaseRepo(); err == nil {
-		_ = gui.setGithubPullRequests()
-		return
+		err := gui.setGithubPullRequests()
+		if err != nil {
+			return err
+		}
+
+		gui.refreshBranches()
+
+		return nil
 	}
 
 	// when config not exits
-	_ = gui.refreshRemotes()
+	err := gui.refreshRemotes()
+	if err != nil {
+		return err
+	}
 
 	_ = gui.c.Prompt(types.PromptOpts{
 		Title:               gui.c.Tr.SelectRemoteRepository,
@@ -48,11 +57,13 @@ func (gui *Gui) refreshGithubPullRequests() {
 				if err != nil {
 					return err
 				}
-				_ = gui.postRefreshUpdate(gui.State.Contexts.Branches)
+				gui.refreshBranches()
 				return nil
 			})
 		},
 	})
+
+	return nil
 }
 
 func (gui *Gui) setGithubPullRequests() error {
diff --git a/pkg/gui/refresh.go b/pkg/gui/refresh.go
index 23be7d1ac..8261204c9 100644
--- a/pkg/gui/refresh.go
+++ b/pkg/gui/refresh.go
@@ -238,7 +238,11 @@ func (gui *Gui) refreshCommitsWithLimit() error {
 	gui.State.Model.Commits = commits
 
 	if gui.Config.GetUserConfig().Git.EnableGhCommand {
-		gui.refreshGithubPullRequests()
+		err = gui.refreshGithubPullRequests()
+
+		if err != nil {
+			return err
+		}
 	}
 
 	return gui.c.PostRefreshUpdate(gui.State.Contexts.LocalCommits)