From 13bcc5d09595aaa46d581438eebda0c5d422ad0d Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Sun, 10 May 2020 09:33:08 +0800
Subject: [PATCH] Prevent resuming completed Futures

---
 src/relay/dnsrelay/mod.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/relay/dnsrelay/mod.rs b/src/relay/dnsrelay/mod.rs
index 2c94cfc0..c4ccee3e 100644
--- a/src/relay/dnsrelay/mod.rs
+++ b/src/relay/dnsrelay/mod.rs
@@ -175,7 +175,7 @@ async fn acl_lookup<Local, Remote>(
     let mut remote_response = None;
     loop {
         tokio::select! {
-            response = &mut remote_response_fut => {
+            response = &mut remote_response_fut, if remote_response.is_none() => {
                 if use_remote {
                     debug!("pick remote response (response): {:?}", response);
                     return (response, true);
@@ -183,7 +183,7 @@ async fn acl_lookup<Local, Remote>(
                     remote_response = Some(response);
                 }
             }
-            decision = &mut decider => {
+            decision = &mut decider, if !use_remote => {
                 if let Some(local_response) = decision {
                     debug!("pick local response (response): {:?}", local_response);
                     return (local_response, false);