Merge remote-tracking branch 'upstream/master'

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/jobs/basejob.cpp b/lib/jobs/basejob.cpp
index f9628c19..979fa431 100644
--- a/lib/jobs/basejob.cpp
+++ b/lib/jobs/basejob.cpp
@@ -514,7 +514,7 @@ BaseJob::Status BaseJob::status() const
 
 QByteArray BaseJob::rawData(int bytesAtMost) const
 {
-    return bytesAtMost > 0 ?
+    return bytesAtMost > 0 && d->rawResponse.size() > bytesAtMost ?
         d->rawResponse.left(bytesAtMost) + "...(truncated)" : d->rawResponse;
 }
 
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();