From fbc821ebb9528f25fcdae8ebe9c019cf04112c13 Mon Sep 17 00:00:00 2001
From: Mark Qvist <bc7291552be7a58f361522990465165c>
Date: Fri, 25 Sep 2026 12:05:34 +0200
Subject: [PATCH] Prepare announce handlers for medium-aware timeout handling,
 by Zenith

---
 LXMF/Handlers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/LXMF/Handlers.py b/LXMF/Handlers.py
index 6239b18..e586b1e 100644
--- a/LXMF/Handlers.py
+++ b/LXMF/Handlers.py
@@ -22,7 +22,7 @@ class LXMFDeliveryAnnounceHandler:
 
         for lxmessage in self.lxmrouter.pending_outbound:
             if destination_hash     == lxmessage.destination_hash:
-                if lxmessage.method == LXMessage.DIRECT or lxmessage.method == LXMessage.OPPORTUNISTIC:
+                if (lxmessage.method == LXMessage.DIRECT or lxmessage.method == LXMessage.OPPORTUNISTIC) and lxmessage.awaiting_path:
                     lxmessage.next_delivery_attempt = time.time()
 
                     def outbound_trigger():
@@ -44,7 +44,7 @@ class LXMFPropagationAnnounceHandler:
                 if destination_hash == self.lxmrouter.get_outbound_propagation_node():
                     if pn_announce_data_is_valid(app_data):
                         for lxmessage in self.lxmrouter.pending_outbound:
-                            if lxmessage.method == LXMessage.PROPAGATED:
+                            if lxmessage.method == LXMessage.PROPAGATED and lxmessage.awaiting_path:
                                 lxmessage.next_delivery_attempt = time.time()
 
                                 def outbound_trigger():