From 379ddfff2961faf381d12560ec78095314ed8018 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 30 Aug 2018 11:50:57 +0200
Subject: [PATCH] dont reassign userToRooms as we're just patching it up, also
 better check if we really have self DMs

---
 src/utils/DMRoomMap.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/utils/DMRoomMap.js b/src/utils/DMRoomMap.js
index 7974ab5681..1db8e7f970 100644
--- a/src/utils/DMRoomMap.js
+++ b/src/utils/DMRoomMap.js
@@ -72,8 +72,9 @@ export default class DMRoomMap {
         if (ev.getType() == 'm.direct') {
             let userToRooms = this.matrixClient.getAccountData('m.direct').getContent();
             const myUserId = this.matrixClient.getUserId();
-            if (userToRooms[myUserId]) {
-                userToRooms = this._patchUpSelfDMs(userToRooms);
+            const selfDMs = userToRooms[myUserId];
+            if (selfDMs && selfDMs.length) {
+                this._patchUpSelfDMs(userToRooms);
                 this.matrixClient.setAccountData('m.direct', userToRooms);
             }
             this.userToRooms = userToRooms;