ignore deleted messages when queueing

diff --git a/Changes b/Changes
index 4476097177bb94b5c130b6c796853f3e957b2992..1c0df002aeac906823834ff826126398b3de2e83 100644 (file)
--- a/Changes
+++ b/Changes
@@ -2,6 +2,7 @@
 1. allow a residence time of (default) 2 days before actually deleting a msg.
 2. reduce the number R: lines on a bull from a bbs to 2 (the origin and the
 last port of call).
+3. ignore deleted messages for queuing purposes
 03Oct01=======================================================================
 1. don't allow @WWW to become a 'TO' field...
 2. handle @gb7tlh.#35.eu type addresses as well

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 75a0c452c0e9034d830afc042820dc02be28b801..118d991034f947d1778ebdb54167458bf4eea910 100644 (file)
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -648,6 +648,7 @@ sub queue_msg
                        $ref->del_msg;
                        next;
                }
+               next if $ref->{delete};
                
                # firstly, is it private and unread? if so can I find the recipient
                # in my cluster node list offsite?