Avoid a save/reload cycle when changing launcher theme.

Makes the problem found in #2816 less severe.
renpy · May 21, 2021 · e921052 · Gouvernathor · May 22, 2021 · renpytom
1 parent 3ec8d89
commit e921052
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/launcher/game/front_page.rpy b/launcher/game/front_page.rpy
@@ -260,6 +260,8 @@ label start:
     show screen bottom_info
     $ dmgcheck()
 
+    jump expression renpy.session.pop("launcher_start_label", "front_page")
+
 label front_page:
     call screen front_page
     jump front_page

diff --git a/launcher/game/preferences.rpy b/launcher/game/preferences.rpy
@@ -53,6 +53,11 @@ init python:
 
     show_legacy = os.path.exists(os.path.join(config.renpy_base, "templates", "english", "game", "script.rpy"))
 
+    class RestartAtPreferences(Action):
+        def __call__(self):
+            renpy.session["launcher_start_label"] = "preferences"
+            renpy.utter_restart()
+
 default persistent.legacy = False
 default persistent.force_new_tutorial = False
 default persistent.sponsor_message = True
@@ -196,11 +201,11 @@ screen preferences:
 
                         textbutton _("Sponsor message") style "l_checkbox" action ToggleField(persistent, "sponsor_message")
 
-                        textbutton _("Default theme") style "l_checkbox" action [SetField(persistent, "theme", None), renpy.reload_script]
-
-                        textbutton _("Clear theme") style "l_checkbox" action [ToggleField(persistent, "theme", "clear", None), renpy.reload_script]
+                        add HALF_SPACER
 
-                        textbutton _("Dark theme") style "l_checkbox" action [ToggleField(persistent, "theme", "dark", None), renpy.reload_script]
+                        textbutton _("Default theme") style "l_checkbox" action [SetField(persistent, "theme", None), RestartAtPreferences() ]
+                        textbutton _("Clear theme") style "l_checkbox" action [SetField(persistent, "theme", "clear", None), RestartAtPreferences() ]
+                        textbutton _("Dark theme") style "l_checkbox" action [SetField(persistent, "theme", "dark", None), RestartAtPreferences()]
 
 
                 if translations: