From ed8eab4c6680a50a3e618fbdb5466bdfd55b9ee4 Mon Sep 17 00:00:00 2001
From: Jack <bartnikjack@gmail.com>
Date: Sun, 4 Apr 2021 00:25:18 +0100
Subject: [PATCH] actually fixed white flashing

---
 src/js/config.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/js/config.js b/src/js/config.js
index 76470ada7..03ddf6456 100644
--- a/src/js/config.js
+++ b/src/js/config.js
@@ -1146,14 +1146,12 @@ export function setIndicateTypos(it, nosave) {
   if (!nosave) saveToCookie();
 }
 
-export function setCustomTheme(boolean, nosave, noThemeChange = false) {
+export function setCustomTheme(boolean, nosave) {
   if (boolean !== undefined) config.customTheme = boolean;
-  if (!noThemeChange) {
-    if (boolean) {
-      ThemeController.set("custom");
-    } else {
-      ThemeController.set(config.theme);
-    }
+  if (boolean) {
+    ThemeController.set("custom");
+  } else if (!boolean && !nosave) {
+    ThemeController.set(config.theme);
   }
   if (!nosave) saveToCookie();
 }
@@ -1358,7 +1356,7 @@ export function apply(configObj) {
   if (configObj && configObj != null && configObj != "null") {
     setTheme(configObj.theme, true);
     setCustomThemeColors(configObj.customThemeColors, true);
-    setCustomTheme(configObj.customTheme, true);
+    setCustomTheme(configObj.customTheme, true, true);
     setQuickTabMode(configObj.quickTab, true);
     setKeyTips(configObj.showKeyTips, true);
     setTimeConfig(configObj.time, true);