aboutsummaryrefslogtreecommitdiff
path: root/lib/connection.cpp
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2020-12-28 19:42:08 +0100
committerKitsune Ral <Kitsune-Ral@users.sf.net>2020-12-28 19:42:08 +0100
commit0bafa198fb08c8545a026a8806b47cf95bdc8272 (patch)
tree297bdb5cd4767a653c1c17d962dc6c10ce76e0d9 /lib/connection.cpp
parenta49c3f2eb4e1aa5c6687c7637c1a06fcd69b0a23 (diff)
parent0f974c0f96f29035ee766e8913504fed4a4903a5 (diff)
downloadlibquotient-0bafa198fb08c8545a026a8806b47cf95bdc8272.tar.gz
libquotient-0bafa198fb08c8545a026a8806b47cf95bdc8272.zip
Merge branch 'kitsune-fix-msvc-build' into master
Diffstat (limited to 'lib/connection.cpp')
-rw-r--r--lib/connection.cpp2
1 files changed, 1 insertions, 1 deletions
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()) {