Skip to content

Commit 362a8f9

Browse files
committed
fixup! fix: reset selection mode after deletion
1 parent b596264 commit 362a8f9

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

pkg/gui/controllers/branches_controller.go

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -557,8 +557,11 @@ func (self *BranchesController) delete(branches []*models.Branch, startIdx int,
557557
Label: lo.Ternary(len(branches) > 1, self.c.Tr.DeleteLocalBranches, self.c.Tr.DeleteLocalBranch),
558558
Key: 'c',
559559
OnPress: func() error {
560+
if err := self.localDelete(branches); err != nil {
561+
return err
562+
}
560563
self.context().SetSelection(startIdx)
561-
return self.localDelete(branches)
564+
return nil
562565
},
563566
}
564567
if isBranchCheckedOut {
@@ -569,8 +572,11 @@ func (self *BranchesController) delete(branches []*models.Branch, startIdx int,
569572
Label: lo.Ternary(len(branches) > 1, self.c.Tr.DeleteRemoteBranches, self.c.Tr.DeleteRemoteBranch),
570573
Key: 'r',
571574
OnPress: func() error {
575+
if err := self.remoteDelete(branches); err != nil {
576+
return err
577+
}
572578
self.context().SetSelection(startIdx)
573-
return self.remoteDelete(branches)
579+
return nil
574580
},
575581
}
576582
if !hasUpstream {
@@ -583,8 +589,11 @@ func (self *BranchesController) delete(branches []*models.Branch, startIdx int,
583589
Label: lo.Ternary(len(branches) > 1, self.c.Tr.DeleteLocalAndRemoteBranches, self.c.Tr.DeleteLocalAndRemoteBranch),
584590
Key: 'b',
585591
OnPress: func() error {
592+
if err := self.localAndRemoteDelete(branches); err != nil {
593+
return err
594+
}
586595
self.context().SetSelection(startIdx)
587-
return self.localAndRemoteDelete(branches)
596+
return nil
588597
},
589598
}
590599
if isBranchCheckedOut {

0 commit comments

Comments
 (0)