From 5dafe1f4a6ea35fab30a28e239c3a34ab37b3fbb Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Fri, 5 Feb 2016 16:22:24 +0000
Subject: [PATCH] Fix canonical alias bug showing the first alias if one was
 not set.

<select> rests on the first value if the defaultValue is null. This first value
should've been 'not set'.
---
 src/components/views/room_settings/AliasSettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index e6cd16fd16..19e18fed48 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -204,6 +204,7 @@ module.exports = React.createClass({
         if (this.props.canSetCanonicalAlias) {
             canonical_alias_section = (
                 <select onChange={this.onCanonicalAliasChange} defaultValue={ this.state.canonicalAlias }>
+                    <option value="" key="unset">not specified</option>
                     {
                         Object.keys(self.state.domainToAliases).map(function(domain, i) {
                             return self.state.domainToAliases[domain].map(function(alias, j) {
@@ -215,7 +216,6 @@ module.exports = React.createClass({
                             });
                         })
                     }
-                    <option value="" key="unset">not specified</option>
                 </select>
             );
         }