[exim-cvs] Events: avoid evaluating intermediates for unneed…

Commit:     7a9e0ae14e5544e8377d1f91298d0ec9a482bf12
Parent:     ceaa36bf3127709e7c31393b8043eaec058d096c
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Tue Jun 4 14:18:59 2019 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Tue Jun 4 14:18:59 2019 +0100

    Events: avoid evaluating intermediates for unneeded events
---
 src/src/deliver.c | 2 +-
 src/src/queue.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/src/deliver.c b/src/src/deliver.c
index b26e5db..dc2e577 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -6244,7 +6244,7 @@ if (process_recipients != RECIP_IGNORE)
         }

 #ifndef DISABLE_EVENT
-      if (process_recipients != RECIP_ACCEPT)
+      if (process_recipients != RECIP_ACCEPT && event_action)
     {
     uschar * save_local =  deliver_localpart;
     const uschar * save_domain = deliver_domain;
diff --git a/src/src/queue.c b/src/src/queue.c
index 89ac87f..f54124c 100644
--- a/src/src/queue.c
+++ b/src/src/queue.c
@@ -1252,7 +1252,7 @@ switch(action)
     if (removed)
       {
 #ifndef DISABLE_EVENT
-      for (int i = 0; i < recipients_count; i++)
+      if (event_action) for (int i = 0; i < recipients_count; i++)
     {
     tree_node *delivered =
       tree_search(tree_nonrecipients, recipients_list[i].address);