aboutsummaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
Diffstat (limited to 'commands')
-rw-r--r--commands/compose/abort.go3
-rw-r--r--commands/compose/postpone.go2
-rw-r--r--commands/compose/send.go2
-rw-r--r--commands/msg/delete.go6
-rw-r--r--commands/msg/move.go8
-rw-r--r--commands/msg/reply.go5
-rw-r--r--commands/msgview/close.go3
-rw-r--r--commands/msgview/next.go2
-rw-r--r--commands/term.go2
-rw-r--r--commands/terminal/close.go2
-rw-r--r--commands/util.go4
11 files changed, 17 insertions, 22 deletions
diff --git a/commands/compose/abort.go b/commands/compose/abort.go
index 44711eb3..d6a81b57 100644
--- a/commands/compose/abort.go
+++ b/commands/compose/abort.go
@@ -26,8 +26,7 @@ func (Abort) Execute(aerc *widgets.Aerc, args []string) error {
}
composer, _ := aerc.SelectedTabContent().(*widgets.Composer)
- aerc.RemoveTab(composer)
- composer.Close()
+ aerc.RemoveTab(composer, true)
return nil
}
diff --git a/commands/compose/postpone.go b/commands/compose/postpone.go
index cc709ff7..dad76877 100644
--- a/commands/compose/postpone.go
+++ b/commands/compose/postpone.go
@@ -84,7 +84,7 @@ func (Postpone) Execute(aerc *widgets.Aerc, args []string) error {
aerc.NewTab(composer, tabName)
}
- aerc.RemoveTab(composer)
+ aerc.RemoveTab(composer, false)
var buf bytes.Buffer
ctr := datacounter.NewWriterCounter(&buf)
err = composer.WriteMessage(header, ctr)
diff --git a/commands/compose/send.go b/commands/compose/send.go
index a5571e37..d43f28ea 100644
--- a/commands/compose/send.go
+++ b/commands/compose/send.go
@@ -145,7 +145,7 @@ func send(aerc *widgets.Aerc, composer *widgets.Composer, ctx sendCtx,
) {
// we don't want to block the UI thread while we are sending
// so we do everything in a goroutine and hide the composer from the user
- aerc.RemoveTab(composer)
+ aerc.RemoveTab(composer, false)
aerc.PushStatus("Sending...", 10*time.Second)
log.Debugf("send uri: %s", ctx.uri.String())
diff --git a/commands/msg/delete.go b/commands/msg/delete.go
index 9a07e509..6d3fb4a3 100644
--- a/commands/msg/delete.go
+++ b/commands/msg/delete.go
@@ -56,11 +56,11 @@ func (Delete) Execute(aerc *widgets.Aerc, args []string) error {
mv, isMsgView := h.msgProvider.(*widgets.MessageViewer)
if isMsgView {
if !config.Ui.NextMessageOnDelete {
- aerc.RemoveTab(h.msgProvider)
+ aerc.RemoveTab(h.msgProvider, true)
} else {
// no more messages in the list
if next == nil {
- aerc.RemoveTab(h.msgProvider)
+ aerc.RemoveTab(h.msgProvider, true)
acct.Messages().Select(-1)
ui.Invalidate()
return
@@ -73,7 +73,7 @@ func (Delete) Execute(aerc *widgets.Aerc, args []string) error {
return
}
nextMv := widgets.NewMessageViewer(acct, view)
- aerc.ReplaceTab(mv, nextMv, next.Envelope.Subject)
+ aerc.ReplaceTab(mv, nextMv, next.Envelope.Subject, true)
})
}
} else {
diff --git a/commands/msg/move.go b/commands/msg/move.go
index fc35c41b..e8661a61 100644
--- a/commands/msg/move.go
+++ b/commands/msg/move.go
@@ -93,12 +93,10 @@ func handleDone(
mv, isMsgView := h.msgProvider.(*widgets.MessageViewer)
switch {
case isMsgView && !config.Ui.NextMessageOnDelete:
- mv.Close()
- aerc.RemoveTab(h.msgProvider)
+ aerc.RemoveTab(h.msgProvider, true)
case isMsgView:
- mv.Close()
if next == nil {
- aerc.RemoveTab(h.msgProvider)
+ aerc.RemoveTab(h.msgProvider, true)
acct.Messages().Select(-1)
ui.Invalidate()
return
@@ -111,7 +109,7 @@ func handleDone(
return
}
nextMv := widgets.NewMessageViewer(acct, view)
- aerc.ReplaceTab(mv, nextMv, next.Envelope.Subject)
+ aerc.ReplaceTab(mv, nextMv, next.Envelope.Subject, true)
})
default:
if next == nil {
diff --git a/commands/msg/reply.go b/commands/msg/reply.go
index 4fb5860a..2b9f5d4f 100644
--- a/commands/msg/reply.go
+++ b/commands/msg/reply.go
@@ -181,9 +181,8 @@ func (reply) Execute(aerc *widgets.Aerc, args []string) error {
aerc.PushError("Error: " + err.Error())
return err
}
- if (mv != nil) && closeOnReply {
- mv.Close()
- aerc.RemoveTab(mv)
+ if mv != nil && closeOnReply {
+ aerc.RemoveTab(mv, true)
}
if args[0] == "reply" {
diff --git a/commands/msgview/close.go b/commands/msgview/close.go
index 1fed0b7c..5e4f3e92 100644
--- a/commands/msgview/close.go
+++ b/commands/msgview/close.go
@@ -25,7 +25,6 @@ func (Close) Execute(aerc *widgets.Aerc, args []string) error {
return errors.New("Usage: close")
}
mv, _ := aerc.SelectedTabContent().(*widgets.MessageViewer)
- mv.Close()
- aerc.RemoveTab(mv)
+ aerc.RemoveTab(mv, true)
return nil
}
diff --git a/commands/msgview/next.go b/commands/msgview/next.go
index d4c02123..cc7a5479 100644
--- a/commands/msgview/next.go
+++ b/commands/msgview/next.go
@@ -53,7 +53,7 @@ func (NextPrevMsg) Execute(aerc *widgets.Aerc, args []string) error {
}
nextMv := widgets.NewMessageViewer(acct, view)
aerc.ReplaceTab(mv, nextMv,
- nextMsg.Envelope.Subject)
+ nextMsg.Envelope.Subject, true)
})
}
if nextMsg := store.Selected(); nextMsg != nil {
diff --git a/commands/term.go b/commands/term.go
index d6662fe1..5d0dd020 100644
--- a/commands/term.go
+++ b/commands/term.go
@@ -45,7 +45,7 @@ func TermCore(aerc *widgets.Aerc, args []string) error {
ui.Invalidate()
}
term.OnClose = func(err error) {
- aerc.RemoveTab(term)
+ aerc.RemoveTab(term, false)
if err != nil {
aerc.PushError(err.Error())
}
diff --git a/commands/terminal/close.go b/commands/terminal/close.go
index 1698e930..812266c0 100644
--- a/commands/terminal/close.go
+++ b/commands/terminal/close.go
@@ -25,6 +25,6 @@ func (Close) Execute(aerc *widgets.Aerc, args []string) error {
return errors.New("Usage: close")
}
term, _ := aerc.SelectedTabContent().(*widgets.Terminal)
- term.Close(nil)
+ term.Close()
return nil
}
diff --git a/commands/util.go b/commands/util.go
index 8b7060ec..7e21e167 100644
--- a/commands/util.go
+++ b/commands/util.go
@@ -38,12 +38,12 @@ func QuickTerm(aerc *widgets.Aerc, args []string, stdin io.Reader) (*widgets.Ter
if err != nil {
aerc.PushError(err.Error())
// remove the tab on error, otherwise it gets stuck
- aerc.RemoveTab(term)
+ aerc.RemoveTab(term, false)
} else {
aerc.PushStatus("Process complete, press any key to close.",
10*time.Second)
term.OnEvent = func(event tcell.Event) bool {
- aerc.RemoveTab(term)
+ aerc.RemoveTab(term, true)
return true
}
}
generated by cgit (git 2.34.1) at 2024-11-15 17:51:23 +0000