From b4521bc44c67b5e524346340be659b9a7f755a21 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <github@rvanderhoff.org.uk>
Date: Thu, 1 Sep 2016 22:45:09 +0100
Subject: [PATCH] review feedback

---
 src/components/structures/MatrixChat.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index b82ef2d1a3..e1e622af65 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -197,6 +197,8 @@ module.exports = React.createClass({
         window.addEventListener('resize', this.handleResize);
         this.handleResize();
 
+        // the extra q() ensures that synchronous exceptions hit the same codepath as
+        // asynchronous ones.
         q().then(() => {
             return Lifecycle.loadSession({
                 realQueryParams: this.props.realQueryParams,