Clear designer settings when resetting theme

daemon.py

@@ -2511,7 +2511,7 @@ class PubServer(BaseHTTPRequestHandler):
                                               system_language)
                 set_theme(base_dir, theme_name, domain,
                           allow_local_network_access, system_language,
-                          dyslexic_font)
+                          dyslexic_font, True)
 
             if calling_domain.endswith('.onion') and onion_domain:
                 origin_path_str = \
@@ -5590,7 +5590,7 @@ class PubServer(BaseHTTPRequestHandler):
                             set_theme(base_dir, self.server.theme_name, domain,
                                       allow_local_network_access,
                                       system_language,
-                                      self.server.dyslexic_font)
+                                      self.server.dyslexic_font, True)
                             self.server.text_mode_banner = \
                                 get_text_mode_banner(self.server.base_dir)
                             self.server.iconsCache = {}
@@ -6545,7 +6545,7 @@ class PubServer(BaseHTTPRequestHandler):
                                 set_theme(base_dir, curr_theme, domain,
                                           allow_local_network_access,
                                           system_language,
-                                          self.server.dyslexic_font)
+                                          self.server.dyslexic_font, False)
                                 self.server.text_mode_banner = \
                                     get_text_mode_banner(base_dir)
                                 self.server.iconsCache = {}
@@ -6842,7 +6842,7 @@ class PubServer(BaseHTTPRequestHandler):
                                       self.server.domain,
                                       self.server.allow_local_network_access,
                                       self.server.system_language,
-                                      self.server.dyslexic_font)
+                                      self.server.dyslexic_font, False)
 
                     # low bandwidth images checkbox
                     if path.startswith('/users/' + admin_nickname + '/') or \

epicyon.py

@@ -3399,7 +3399,7 @@ if twitter_domain:
 
 if set_theme(base_dir, theme_name, domain,
              args.allow_local_network_access, args.language,
-             args.dyslexic_font):
+             args.dyslexic_font, False):
     print('Theme set to ' + theme_name)
 
 # whether new registrations are open or closed

theme.py

@@ -528,7 +528,7 @@ def set_theme_from_designer(base_dir: str, theme_name: str, domain: str,
     save_json(theme_params, custom_theme_filename)
     set_theme(base_dir, theme_name, domain,
               allow_local_network_access, system_language,
-              dyslexic_font)
+              dyslexic_font, False)
 
 
 def reset_theme_designer_settings(base_dir: str, theme_name: str, domain: str,
@@ -846,7 +846,7 @@ def _set_clear_cache_flag(base_dir: str) -> None:
 
 def set_theme(base_dir: str, name: str, domain: str,
               allow_local_network_access: bool, system_language: str,
-              dyslexic_font: bool) -> bool:
+              dyslexic_font: bool, designer_reset: bool) -> bool:
     """Sets the theme with the given name as the current theme
     """
     result = False
@@ -854,7 +854,7 @@ def set_theme(base_dir: str, name: str, domain: str,
     prev_theme_name = get_theme(base_dir)
 
     # if the theme has changed then remove any custom settings
-    if prev_theme_name != name:
+    if prev_theme_name != name or designer_reset:
         reset_theme_designer_settings(base_dir, name, domain,
                                       allow_local_network_access,
                                       system_language)