From 8d1095bc267dbfdbf5f8b95bbd687835dd0d7058 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 9 Dec 2016 10:32:56 +0000
Subject: [PATCH] Don't throw exception on stop if no DMRoomMap

Prevents an exception when running the riot 'loading' tests in
isolation
---
 src/Lifecycle.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 62fbe5f929..0a61dc6105 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -356,7 +356,7 @@ export function stopMatrixClient() {
     Notifier.stop();
     UserActivity.stop();
     Presence.stop();
-    DMRoomMap.shared().stop();
+    if (DMRoomMap.shared()) DMRoomMap.shared().stop();
     var cli = MatrixClientPeg.get();
     if (cli) {
         cli.stopClient();