forward: fix panic when using :eml

Fix a panic when forwarding a message that was opened with :eml. :forward will try to the set the forwarded flag but there's no associated message store available for that message (it's either loaded from disk or an attachment). Fixes: b94b4c0 ("forward: allow forwarded flag to be set") Reported-by: inwit <[email protected]> Signed-off-by: Koni Marti <[email protected]> Tested-by: Inwit <[email protected]> Acked-by: Robin Jarry <[email protected]>
rjarry · Nov 9, 2024 · 7f28ba1 · 7f28ba1
1 parent edeac1a
commit 7f28ba1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/commands/msg/forward.go b/commands/msg/forward.go
@@ -167,7 +167,7 @@ func (f forward) Execute(args []string) error {
 			}
 			composer.AddAttachment(tmpFileName)
 			composer.OnClose(func(c *app.Composer) {
-				if c.Sent() {
+				if c.Sent() && store != nil {
 					store.Forwarded([]models.UID{msg.Uid}, true, nil)
 				}
 				os.RemoveAll(tmpDir)
@@ -219,7 +219,7 @@ func (f forward) Execute(args []string) error {
 			}
 
 			composer.OnClose(func(c *app.Composer) {
-				if c.Sent() {
+				if c.Sent() && store != nil {
 					store.Forwarded([]models.UID{msg.Uid}, true, nil)
 				}
 			})