From fef70c528ba67780f7a73381e4b57e3044d2125c Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Wed, 4 Feb 2015 10:43:49 +0100
Subject: [PATCH] Possibly fix weird control visibility issue #7417 although I
 don't quite get it..

---
 UI/TouchControlVisibilityScreen.cpp | 1 +
 UI/TouchControlVisibilityScreen.h   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/UI/TouchControlVisibilityScreen.cpp b/UI/TouchControlVisibilityScreen.cpp
index 949b41cb10..4c8d586c15 100644
--- a/UI/TouchControlVisibilityScreen.cpp
+++ b/UI/TouchControlVisibilityScreen.cpp
@@ -52,6 +52,7 @@ void TouchControlVisibilityScreen::CreateViews() {
 	keyImages["L"] = I_L;
 	keyImages["R"] = I_R;
 
+	keyToggles.clear();
 	keyToggles["Circle"] = &g_Config.bShowTouchCircle;
 	keyToggles["Cross"] = &g_Config.bShowTouchCross;
 	keyToggles["Square"] = &g_Config.bShowTouchSquare;
diff --git a/UI/TouchControlVisibilityScreen.h b/UI/TouchControlVisibilityScreen.h
index 85b4a6f124..dd36bc9c1c 100644
--- a/UI/TouchControlVisibilityScreen.h
+++ b/UI/TouchControlVisibilityScreen.h
@@ -27,7 +27,7 @@ namespace UI {
 
 class TouchControlVisibilityScreen : public UIDialogScreenWithBackground {
 public:
-	TouchControlVisibilityScreen() { }
+	TouchControlVisibilityScreen() : toggleSwitch(true){ }
 
 	virtual void CreateViews();
 	virtual void onFinish(DialogResult result);