split: refactor to prevent stuck splits

Refactor split logic (again...) to prevent stuck splits. Use callback
from msgstore.Select to tell the split which message to display. This
keeps the account from having to track displayed messages, which
prevents race conditions in certain situations.

Signed-off-by: Tim Culverhouse <tim@timculverhouse.com>
Tested-by: Bence Ferdinandy <bence@ferdinandy.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/commands/account/split.go b/commands/account/split.go
index daf1f0f0..6641641b 100644
--- a/commands/account/split.go
+++ b/commands/account/split.go
@@ -51,10 +51,8 @@ func (Split) Execute(aerc *widgets.Aerc, args []string) error {
 		}
 		if delta {
 			n = acct.SplitSize() + n
-			// Maintain split direction when using deltas
-			if acct.SplitSize() > 0 {
-				args[0] = acct.SplitDirection()
-			}
+			acct.SetSplitSize(n)
+			return nil
 		}
 	}
 	if n == acct.SplitSize() {
@@ -66,8 +64,11 @@ func (Split) Execute(aerc *widgets.Aerc, args []string) error {
 		// Don't allow split to go negative
 		n = 1
 	}
-	if args[0] == "split" {
+	switch args[0] {
+	case "split":
 		return acct.Split(n)
+	case "vsplit":
+		return acct.Vsplit(n)
 	}
-	return acct.Vsplit(n)
+	return nil
 }