compose: support adding attachments when groups are present

l2dy · Jan 14, 2022 · 5280087 · 5280087
1 parent 149497e
commit 5280087
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/compose/functions.c b/compose/functions.c
@@ -486,9 +486,16 @@ static int delete_attachment(struct AttachCtx *actx, int aidx)
  */
 static void update_idx(struct Menu *menu, struct AttachCtx *actx, struct AttachPtr *ap)
 {
-  ap->level = (actx->idxlen > 0) ? actx->idx[actx->idxlen - 1]->level : 0;
-  if (actx->idxlen)
-    actx->idx[actx->idxlen - 1]->body->next = ap->body;
+  ap->level = 0;
+  for (int i = actx->idxlen; i > 0; i--)
+  {
+    if (ap->level == actx->idx[i - 1]->level)
+    {
+      actx->idx[i - 1]->body->next = ap->body;
+      break;
+    }
+  }
+
   ap->body->aptr = ap;
   mutt_actx_add_attach(actx, ap);
   update_menu(actx, menu, false);