Don't reconnect to the previously preferred server

2 files changed, 6 insertions, 4 deletions

diff --git a/app/components/SelectLocation.js b/app/components/SelectLocation.js
index 5a1fb5d342..4f2218d08c 100644
--- a/app/components/SelectLocation.js
+++ b/app/components/SelectLocation.js
@@ -18,7 +18,9 @@ export default class SelectLocation extends Component {
   _selectedCell: ?HTMLElement;
 
   onSelect(name: string) {
-    this.props.onSelect(name);
+    if (!this.isSelected(name)) {
+      this.props.onSelect(name);
+    }
   }
 
   isSelected(server: string) {
diff --git a/test/components/SelectLocation.spec.js b/test/components/SelectLocation.spec.js
index 28e21eb697..783a3adbf9 100644
--- a/test/components/SelectLocation.spec.js
+++ b/test/components/SelectLocation.spec.js
@@ -43,8 +43,8 @@ describe('components/SelectLocation', () => {
       onSelect: (_server) => done()
     });
     const elements = ReactTestUtils.scryRenderedDOMComponentsWithClass(render(props), 'select-location__cell');
-    expect(elements).to.have.length.greaterThan(0);
-    Simulate.click(elements[0]);
+    expect(elements).to.have.length.greaterThan(1);
+    Simulate.click(elements[1]);
   });
 
-});
\ No newline at end of file
+});