From aeb2f5402a1c55ddae353c0e251e5913dea2aea5 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 31 Aug 2020 16:08:47 +0200
Subject: [PATCH] process own membership changes before device lists

---
 src/matrix/Session.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/matrix/Session.js b/src/matrix/Session.js
index 6cf9225c..90db1b68 100644
--- a/src/matrix/Session.js
+++ b/src/matrix/Session.js
@@ -173,15 +173,15 @@ export class Session {
             changes.syncInfo = syncInfo;
         }
         if (this._deviceTracker) {
-            const deviceLists = syncResponse.device_lists;
-            if (deviceLists) {
-                await this._deviceTracker.writeDeviceChanges(deviceLists, txn);
-            }
             for (const {room, changes} of roomChanges) {
                 if (room.isTrackingMembers && changes.memberChanges?.size) {
                     await this._deviceTracker.writeMemberChanges(room, changes.memberChanges, txn);
                 }
             } 
+            const deviceLists = syncResponse.device_lists;
+            if (deviceLists) {
+                await this._deviceTracker.writeDeviceChanges(deviceLists, txn);
+            }
         }
         return changes;
     }