diff options
Diffstat (limited to 'windowRepos.go')
| -rw-r--r-- | windowRepos.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/windowRepos.go b/windowRepos.go index 2178c77..5f3cf25 100644 --- a/windowRepos.go +++ b/windowRepos.go @@ -127,7 +127,7 @@ func (r *repoWindow) repoMenu() *gui.Node { box2.NewButton("test master merge", func() { r.Disable() r.mergeAllDevelToMain() - r.reInitForge() + // r.reInitForge() r.Enable() }) @@ -176,8 +176,14 @@ func (r *repoWindow) mergeAllDevelToMain() bool { } if result, err := repo.MergeDevelToMaster(); err == nil { log.Warn("MERGE WORKED", repo.GetFullPath()) + repo.Reload() + vrepo := me.repos.View.FindByPath(repo.GetGoPath()) + if vrepo != nil { + vrepo.UpdatePb(repo) + vrepo.NewScan() + } // continue - return true + continue } else { log.Warn("THINGS FAILED ", repo.GetFullPath()) log.Warn("err", err) |