Merge pull request #199 from mebjas/develop

fixed issue vector-im/vector-web 1079
2016-03-07 16:15:45 +00:00 · 2016-03-07 16:15:45 +00:00 · a2c6bd0e6c
commit a2c6bd0e6c
parent a7c75b1315 7e7493b336
1 changed files with 9 additions and 1 deletions
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@ -589,7 +589,15 @@ module.exports = React.createClass({
                    var theAlias = MatrixTools.getCanonicalAliasForRoom(room);
                    if (theAlias) presentedId = theAlias;
                }
-                self.notifyNewScreen('room/'+presentedId);
+
+                if (presentedId != undefined) {
+                    self.notifyNewScreen('room/'+presentedId);
+                } else {
+                    // There is no information on presentedId
+                    // so point user to fallback like /directory
+                    self.notifyNewScreen('directory');
+                }
+
                dis.dispatch({action: 'focus_composer'});
            } else {
                self.setState({ready: true});