From a30110b5d3e06c22b3f1769b04e33b83e9649c31 Mon Sep 17 00:00:00 2001
From: Marcel <MTRNord@users.noreply.github.com>
Date: Sat, 27 May 2017 21:11:00 +0200
Subject: [PATCH 1/2] Fix vector-im/riot-web#4042

---
 src/components/structures/UserSettings.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 993586df84..992830066f 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -546,11 +546,13 @@ module.exports = React.createClass({
     },
 
     onLanguageChange: function(l) {
-        UserSettingsStore.setLocalSetting('language', l);
-        this.setState({
-            language: l,
-        });
-        PlatformPeg.get().reload();
+        if(this.state.language !== l) {
+            UserSettingsStore.setLocalSetting('language', l);
+            this.setState({
+                language: l,
+            });
+            PlatformPeg.get().reload();
+        }
     },
 
     _renderLanguageSetting: function () {

From 8935e9706ebc7cbfc056f6fc396b335d071d2b59 Mon Sep 17 00:00:00 2001
From: Marcel <MTRNord@users.noreply.github.com>
Date: Sat, 27 May 2017 21:21:23 +0200
Subject: [PATCH 2/2] Change variable name as mentioned by t3chguy

---
 src/components/structures/UserSettings.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 992830066f..f4bf8b18cb 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -545,11 +545,11 @@ module.exports = React.createClass({
         );
     },
 
-    onLanguageChange: function(l) {
-        if(this.state.language !== l) {
-            UserSettingsStore.setLocalSetting('language', l);
+    onLanguageChange: function(newLang) {
+        if(this.state.language !== newLang) {
+            UserSettingsStore.setLocalSetting('language', newLang);
             this.setState({
-                language: l,
+                language: newLang,
             });
             PlatformPeg.get().reload();
         }