From 2174e1980fd2cf5407ba8cd7cabb85d74d242ed2 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Mon, 28 Dec 2020 18:57:07 +0100
Subject: event.h: Fix breakage of AppVeyor CI

The breakage was caused by 639f1d48.
---
 lib/events/event.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/events/event.h b/lib/events/event.h
index 309ebddf..9f2f4f91 100644
--- a/lib/events/event.h
+++ b/lib/events/event.h
@@ -327,8 +327,9 @@ inline auto visit(const BaseEventT& event, FnT&& visitor)
 }
 
 namespace _impl {
+    // Using bool instead of auto below because auto apparently upsets MSVC
     template <class BaseT, typename FnT>
-    inline constexpr auto needs_downcast =
+    inline constexpr bool needs_downcast =
         std::is_base_of_v<BaseT, std::decay_t<fn_arg_t<FnT>>>
         && !std::is_same_v<BaseT, std::decay_t<fn_arg_t<FnT>>>;
 }
-- 
cgit v1.2.3


From 0f974c0f96f29035ee766e8913504fed4a4903a5 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Mon, 28 Dec 2020 19:18:34 +0100
Subject: Connection: fix FTBFS with Quotient_E2EE_ENABLED

---
 lib/connection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/connection.cpp b/lib/connection.cpp
index f59d2962..42b17570 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -451,7 +451,7 @@ void Connection::Private::completeSetup(const QString& mxId)
 #ifndef Quotient_E2EE_ENABLED
     qCWarning(E2EE) << "End-to-end encryption (E2EE) support is turned off.";
 #else // Quotient_E2EE_ENABLED
-    AccountSettings accountSettings(userId);
+    AccountSettings accountSettings(data->userId());
     encryptionManager.reset(
         new EncryptionManager(accountSettings.encryptionAccountPickle()));
     if (accountSettings.encryptionAccountPickle().isEmpty()) {
-- 
cgit v1.2.3