msgstore: fetch missing headers in visual mode

fetches missing headers when in visual selection mode. This prevents
large archive operations from panicking due to a nil pointer
dereference.

The archive command will return an error to the ui when a nil message is
encountered to signal that the message store is not ready yet.

Signed-off-by: Koni Marti <koni.marti@gmail.com>

2 files changed, 10 insertions, 0 deletions

diff --git a/commands/util.go b/commands/util.go
index ffc5ed6c..f3f9bc83 100644
--- a/commands/util.go
+++ b/commands/util.go
@@ -188,6 +188,9 @@ func MsgInfoFromUids(store *lib.MessageStore, uids []uint32) ([]*models.MessageI
 		if !ok {
 			return nil, fmt.Errorf("uid not found")
 		}
+		if infos[i] == nil {
+			return nil, fmt.Errorf("message store not ready yet")
+		}
 	}
 	return infos, nil
 }
diff --git a/lib/msgstore.go b/lib/msgstore.go
index 40720b46..051a7d2c 100644
--- a/lib/msgstore.go
+++ b/lib/msgstore.go
@@ -523,6 +523,13 @@ func (store *MessageStore) updateVisual() {
 	for _, uid := range visUids {
 		store.marked[uid] = struct{}{}
 	}
+	missing := make([]uint32, 0)
+	for _, uid := range visUids {
+		if msg, _ := store.Messages[uid]; msg == nil {
+			missing = append(missing, uid)
+		}
+	}
+	store.FetchHeaders(missing, nil)
 }
 
 func (store *MessageStore) NextPrev(delta int) {