From 3de2a2d96cb892e3bac67e252e1bbe20d39d68f4 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Sun, 19 Apr 2026 21:15:12 +0200 Subject: [PATCH] Extract PreserveCommitMessage from CloseCommitMessagePanel We'll want to call just the preservation step when the app is quitting with the commit message panel open: at that point the view-hiding and context-popping in CloseCommitMessagePanel are pointless (the app is about to exit), and some of the focus-lost side effects could be surprising during teardown. --- pkg/gui/controllers/helpers/commits_helper.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/gui/controllers/helpers/commits_helper.go b/pkg/gui/controllers/helpers/commits_helper.go index 00b26b7f9..ed97ff41b 100644 --- a/pkg/gui/controllers/helpers/commits_helper.go +++ b/pkg/gui/controllers/helpers/commits_helper.go @@ -173,13 +173,17 @@ func (self *CommitsHelper) HandleCommitConfirm() error { return nil } -func (self *CommitsHelper) CloseCommitMessagePanel() { +func (self *CommitsHelper) PreserveCommitMessage() { if self.c.Contexts().CommitMessage.GetPreserveMessage() { message := self.JoinCommitMessageAndUnwrappedDescription() if message != self.c.Contexts().CommitMessage.GetInitialMessage() { self.c.Contexts().CommitMessage.SetPreservedMessageAndLogError(message) } } +} + +func (self *CommitsHelper) CloseCommitMessagePanel() { + self.PreserveCommitMessage() self.c.Contexts().CommitMessage.SetHistoryMessage("")