From 2395e3cd3f087bd05c5cec94b95c73231383054b Mon Sep 17 00:00:00 2001
From: Linus Jahn <lnj@kaidan.im>
Date: Sun, 22 Jan 2023 19:25:35 +0100
Subject: Fix discovery manager incoming request handling

Fixes #529.
---
 src/client/QXmppIqHandling.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/client')

diff --git a/src/client/QXmppIqHandling.h b/src/client/QXmppIqHandling.h
index 530e214b..0782dd89 100644
--- a/src/client/QXmppIqHandling.h
+++ b/src/client/QXmppIqHandling.h
@@ -55,7 +55,7 @@ namespace Private {
                                const std::optional<QXmppE2eeMetadata> &e2eeMetadata,
                                QXmppTask<T> future)
     {
-        Private::await(future, client, [client, requestId, requestFrom, e2eeMetadata](T result) {
+        future.then(client, [client, requestId, requestFrom, e2eeMetadata](T result) {
             processHandleIqResult(client, requestId, requestFrom, e2eeMetadata, result);
         });
     }
@@ -97,6 +97,7 @@ namespace Private {
                 client,
                 iq.id(),
                 iq.from(),
+                e2eeMetadata,
                 invokeIqHandler(std::forward<Handler>(handler), std::move(iq)));
             return true;
         }
@@ -271,7 +272,7 @@ bool handleIqRequests(const QDomElement &element,
 template<typename... IqTypes, typename Handler>
 bool handleIqRequests(const QDomElement &element, QXmppClient *client, Handler handler)
 {
-    return handleIqRequests(element, std::nullopt, client, std::forward<Handler>(handler));
+    return handleIqRequests<IqTypes...>(element, std::nullopt, client, std::forward<Handler>(handler));
 }
 
 }  // namespace QXmpp
-- 
cgit v1.2.3