exotui: always push tag names onto the stack when changing tags (even…

… if tag is deleted as we switch)
neutralinsomniac · Apr 4, 2020 · b491e7b · b491e7b
1 parent 44035ce
commit b491e7b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/cmd/exotui/exotui.go b/cmd/exotui/exotui.go
@@ -100,13 +100,10 @@ func (s *state) Refresh() {
 
 func (s *state) SwitchTag(tag db.Tag) {
 	if tag.ID != s.CurrentDBTag.ID {
-		deleted, err := s.DeleteTagIfEmpty(s.CurrentDBTag.ID)
+		err := s.DeleteTagIfEmpty(s.CurrentDBTag.ID)
 		checkErr(err)
-		// if we're switching to a new tag, and this tag didn't just get wiped,
-		//  push it onto our tag stack
-		if !deleted {
-			s.tagStack = append(s.tagStack, s.CurrentDBTag.Name)
-		}
+		// if we're switching to a new tag, push it onto our tag stack
+		s.tagStack = append(s.tagStack, s.CurrentDBTag.Name)
 	}
 
 	s.CurrentDBTag = tag
@@ -128,7 +125,7 @@ func (s *state) PopTag() {
 
 	// have to do the manual tag switch dance since SwitchTag() will push onto the tag stack
 	if tag.ID != s.CurrentDBTag.ID {
-		_, err := s.DeleteTagIfEmpty(s.CurrentDBTag.ID)
+		err := s.DeleteTagIfEmpty(s.CurrentDBTag.ID)
 		checkErr(err)
 	}
 

diff --git a/db/state.go b/db/state.go
@@ -44,13 +44,11 @@ End:
 	return err
 }
 
-func (s *State) DeleteTagIfEmpty(id int64) (bool, error) {
+func (s *State) DeleteTagIfEmpty(id int64) error {
 	var rows []Row
 	var refs Refs
 	var err error
 
-	deleted := false
-
 	rows, err = s.DB.GetRowsForTagID(id)
 	if err != nil {
 		goto End
@@ -63,9 +61,8 @@ func (s *State) DeleteTagIfEmpty(id int64) (bool, error) {
 
 	if len(rows)+len(refs) == 0 {
 		err = s.DB.DeleteTagByID(id)
-		deleted = true
 	}
 
 End:
-	return deleted, err
+	return err
 }