diff options
author | Black Hat <bhat@encom.eu.org> | 2018-09-12 21:04:29 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-12 21:04:29 +0800 |
commit | 1e78ca6b9c09cb16677ab3db1656085adbd4901b (patch) | |
tree | 633a6e8fe8a244b44b510b608ec3103431a0e042 /lib/jobs | |
parent | 79f338877dec3de5ec7394f190025395877cb00b (diff) | |
parent | 2a1596c16baad77fc80391c66694101f91028deb (diff) | |
download | libquotient-1e78ca6b9c09cb16677ab3db1656085adbd4901b.tar.gz libquotient-1e78ca6b9c09cb16677ab3db1656085adbd4901b.zip |
Merge pull request #1 from QMatrixClient/master
Merge to latest commit.
Diffstat (limited to 'lib/jobs')
-rw-r--r-- | lib/jobs/syncjob.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/jobs/syncjob.cpp b/lib/jobs/syncjob.cpp index 02690e6d..9cbac71b 100644 --- a/lib/jobs/syncjob.cpp +++ b/lib/jobs/syncjob.cpp @@ -130,10 +130,10 @@ SyncRoomData::SyncRoomData(const QString& roomId_, JoinState joinState_, switch (joinState) { case JoinState::Join: ephemeral = load<Events>(room_, "ephemeral"_ls); - accountData = load<Events>(room_, "account_data"_ls); FALLTHROUGH; case JoinState::Leave: { + accountData = load<Events>(room_, "account_data"_ls); timeline = load<RoomEvents>(room_, "timeline"_ls); const auto timelineJson = room_.value("timeline"_ls).toObject(); timelineLimited = timelineJson.value("limited"_ls).toBool(); |