Merge pull request #2821 from YaoiFangirl420/develop

Fix bug with NetworkList dropdown
matrix-org · Mar 24, 2019 · 7b972e4 · 7b972e4
2 parents 68997f9 + 00335e2
commit 7b972e4
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/components/views/directory/NetworkDropdown.js b/src/components/views/directory/NetworkDropdown.js
@@ -131,10 +131,11 @@ export default class NetworkDropdown extends React.Component {
 
     _getMenuOptions() {
         const options = [];
+        const roomDirectory = this.props.config.roomDirectory || {};
 
         let servers = [];
-        if (this.props.config.roomDirectory.servers) {
-            servers = servers.concat(this.props.config.roomDirectory.servers);
+        if (roomDirectory.servers) {
+            servers = servers.concat(roomDirectory.servers);
         }
 
         if (!servers.includes(MatrixClientPeg.getHomeServerName())) {