From d08f1df674f0e9861302e45c8bcbde76de616a2e Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Fri, 25 Nov 2016 17:31:02 +1100
Subject: [PATCH] [Android] Always recreate controllers after settings

---
 .../project64/game/GameLifecycleHandler.java  | 22 +++----------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/Android/src/emu/project64/game/GameLifecycleHandler.java b/Android/src/emu/project64/game/GameLifecycleHandler.java
index 41084b13e..7c5a22191 100644
--- a/Android/src/emu/project64/game/GameLifecycleHandler.java
+++ b/Android/src/emu/project64/game/GameLifecycleHandler.java
@@ -326,25 +326,9 @@ public class GameLifecycleHandler implements View.OnKeyListener, SurfaceHolder.C
 
     public void onSettingDone ()
     {
-        float touchscreenScale = ((float)NativeExports.UISettingsLoadDword(UISettingID.TouchScreen_ButtonScale.getValue())) / 100.0f;
-        boolean recreateTouchScreenControls = false;
-        if (touchscreenScale != mtouchscreenScale)
-        {
-            mtouchscreenScale = touchscreenScale;
-            recreateTouchScreenControls = true;
-        }
-
-        String layout = NativeExports.UISettingsLoadString(UISettingID.TouchScreen_Layout.getValue());
-        if (layout != mlayout)
-        {
-            mlayout = layout;
-            recreateTouchScreenControls = true;
-        }
-
-        if (recreateTouchScreenControls)
-        {
-            CreateTouchScreenControls();
-        }
+        mtouchscreenScale = ((float)NativeExports.UISettingsLoadDword(UISettingID.TouchScreen_ButtonScale.getValue())) / 100.0f;
+        mlayout = NativeExports.UISettingsLoadString(UISettingID.TouchScreen_Layout.getValue());
+        CreateTouchScreenControls();
     }
 
     private void CreateTouchScreenControls()