From a32abae5a37d2a77328127ff79e492917cb87474 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 28 Sep 2016 10:58:01 +0100
Subject: [PATCH] Don't use _matrix as default if there isn't one

---
 .../views/directory/NetworkDropdown.js           | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/views/directory/NetworkDropdown.js b/src/components/views/directory/NetworkDropdown.js
index e98922f2c2..3fcd8bb4a7 100644
--- a/src/components/views/directory/NetworkDropdown.js
+++ b/src/components/views/directory/NetworkDropdown.js
@@ -18,8 +18,8 @@ import React from 'react';
 import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
 
 export default class NetworkDropdown extends React.Component {
-    constructor() {
-        super();
+    constructor(props) {
+        super(props);
 
         this.dropdownRootElement = null;
         this.ignoreEvent = null;
@@ -34,10 +34,20 @@ export default class NetworkDropdown extends React.Component {
 
         this.inputTextBox = null;
 
+        let defaultNetwork = null;
+        if (
+            this.props.config.serverConfig &&
+            this.props.config.serverConfig[server] &&
+            this.props.config.serverConfig[server].networks &&
+            '_matrix' in this.props.config.serverConfig[server].networks
+        ) {
+            defaultNetwork = '_matrix';
+        }
+
         this.state = {
             expanded: false,
             selectedServer: MatrixClientPeg.getHomeServerName(),
-            selectedNetwork: '_matrix',
+            selectedNetwork: defaultNetwork,
         };
     }