Merge pull request #2680 from alexte/develop

RoomDirectory Dropdown should use roomDirectory.servers
matrix-org · Feb 22, 2019 · d6f8f8a · d6f8f8a
2 parents 86c49d5 + 892802e
commit d6f8f8a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/components/views/directory/NetworkDropdown.js b/src/components/views/directory/NetworkDropdown.js
@@ -131,8 +131,8 @@ export default class NetworkDropdown extends React.Component {
         const options = [];
 
         let servers = [];
-        if (this.props.config.servers) {
-            servers = servers.concat(this.props.config.servers);
+        if (this.props.config.roomDirectory.servers) {
+            servers = servers.concat(this.props.config.roomDirectory.servers);
         }
 
         if (servers.indexOf(MatrixClientPeg.getHomeServerName()) == -1) {