From 8a16751a8f95b97b920b2705e17fb756fb01736c Mon Sep 17 00:00:00 2001
From: StackZ <47382115+SuperSaiyajinStackZ@users.noreply.github.com>
Date: Wed, 27 May 2020 14:38:14 +0200
Subject: [PATCH] Do NOT allow fade effects for now.

---
 source/screens/settings.cpp |  8 ++++----
 source/utils/config.cpp     | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/source/screens/settings.cpp b/source/screens/settings.cpp
index 3f385ae..8a25eb0 100644
--- a/source/screens/settings.cpp
+++ b/source/screens/settings.cpp
@@ -266,7 +266,7 @@ void Settings::MiscSettingsLogic(u32 hDown, u32 hHeld, touchPosition touch) {
 			Config::keyDelay = Input::getUint(255, Lang::get("ENTER_KEY_DELAY"));
 			changesMade = true;
 		} else if (Selection == 3) {
-			if (Config::fading) {
+			/*if (Config::fading) {
 				if (Msg::promptMsg(Lang::get("TOGGLE_FADE_DISABLE"))) {
 					Config::fading = false;
 					Msg::DisplayWarnMsg(Lang::get("DISABLED"));
@@ -278,7 +278,7 @@ void Settings::MiscSettingsLogic(u32 hDown, u32 hHeld, touchPosition touch) {
 					Msg::DisplayWarnMsg(Lang::get("ENABLED"));
 					changesMade = true;
 				}
-			}
+			}*/
 		}
 	}
 
@@ -296,7 +296,7 @@ void Settings::MiscSettingsLogic(u32 hDown, u32 hHeld, touchPosition touch) {
 		} else if (touching(touch, mainButtons2[2])) {
 			Config::keyDelay = Input::getUint(255, Lang::get("ENTER_KEY_DELAY"));
 			changesMade = true;
-		} else if (touching(touch, mainButtons2[3])) {
+		} /*else if (touching(touch, mainButtons2[3])) {
 			if (Config::fading) {
 				if (Msg::promptMsg(Lang::get("TOGGLE_FADE_DISABLE"))) {
 					Config::fading = false;
@@ -310,7 +310,7 @@ void Settings::MiscSettingsLogic(u32 hDown, u32 hHeld, touchPosition touch) {
 					changesMade = true;
 				}
 			}
-		}
+		}*/
 	}
 
 	if ((hDown & KEY_B || hDown & KEY_L) || (hDown & KEY_TOUCH && touching(touch, arrowPos[2]))) {
diff --git a/source/utils/config.cpp b/source/utils/config.cpp
index 2fba676..f2dfa4c 100644
--- a/source/utils/config.cpp
+++ b/source/utils/config.cpp
@@ -55,7 +55,7 @@ int Config::notFound;
 int Config::future;
 int Config::Button;
 int Config::keyDelay = 5;
-bool Config::fading = true;
+bool Config::fading = false;
 nlohmann::json configJson;
 extern bool changesMade;
 
@@ -208,11 +208,11 @@ void Config::load() {
 			keyDelay = getInt("KEY_DELAY");
 		}
 
-		if(!configJson.contains("SCREEN_FADE")) {
-			fading = true;
+	/*	if(!configJson.contains("SCREEN_FADE")) {
+			fading = false;
 		} else {
 			fading = getBool("SCREEN_FADE");
-		}
+		}*/
 
 		fclose(file);
 	} else {
@@ -237,9 +237,9 @@ void Config::load() {
 		uptodate = C2D_Color32(0xa5, 0xdd, 0x81, 255);
 		notFound = C2D_Color32(255, 128, 0, 255);
 		future	 = C2D_Color32(255, 255, 0, 255);
-		Button 	 = C2D_Color32(0, 0, 50, 255);
+		Button	 = C2D_Color32(0, 0, 50, 255);
 		keyDelay = 5;
-		fading = true;
+		fading = false;
 	}
 }
 
@@ -301,7 +301,7 @@ void Config::initializeNewConfig() {
 	setInt("FUTURE", C2D_Color32(255, 255, 0, 255));
 	setInt("BUTTON", C2D_Color32(0, 0, 50, 255));
 	setInt("KEY_DELAY", 5);
-	setBool("SCREEN_FADE", true);
+	setBool("SCREEN_FADE", false);
 
 	if(file)	fwrite(configJson.dump(1, '\t').c_str(), 1, configJson.dump(1, '\t').size(), file);
 	fclose(file);