From fb08910db377f9108028403c014e7bfa18cf5ca9 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 16 Dec 2016 10:12:49 +0000
Subject: [PATCH] Read the icon from the right place

Also don't define image widths in the HTML as it's done in the CSS.
---
 src/components/views/directory/NetworkDropdown.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/views/directory/NetworkDropdown.js b/src/components/views/directory/NetworkDropdown.js
index fa16cfdb35..4b6de26eaf 100644
--- a/src/components/views/directory/NetworkDropdown.js
+++ b/src/components/views/directory/NetworkDropdown.js
@@ -197,7 +197,7 @@ export default class NetworkDropdown extends React.Component {
         if (handleClicks === undefined) handleClicks = true;
 
         const name = instance.desc;
-        const icon = <img src={protocol.icon || DEFAULT_ICON_URL} width="16" />;
+        const icon = <img src={instance.icon || DEFAULT_ICON_URL} />;
         const key = instance.instance_id;
         const click_handler = handleClicks ? this.onMenuOptionClickProtocolInstance.bind(this, server, instance.instance_id) : null;
         
@@ -218,7 +218,7 @@ export default class NetworkDropdown extends React.Component {
             span_class = 'mx_NetworkDropdown_menu_all';
         } else if (network == '_matrix') {
             name = 'Matrix';
-            icon = <img src="img/network-matrix.svg" width="16" height="16" />;
+            icon = <img src="img/network-matrix.svg" />;
             span_class = 'mx_NetworkDropdown_menu_network';
         } else {
             if (this.props.config.networks[network] === undefined) {
@@ -232,9 +232,9 @@ export default class NetworkDropdown extends React.Component {
             if (this.props.config.networks[network].icon) {
                 // omit height here so if people define a non-square logo in the config, it
                 // will keep the aspect when it scales
-                icon = <img src={this.props.config.networks[network].icon} width="16" />;
+                icon = <img src={this.props.config.networks[network].icon} />;
             } else {
-                icon = <img src={iconPath} width="16" height="16" />;
+                icon = <img src={iconPath} />;
             }
 
             span_class = 'mx_NetworkDropdown_menu_network';