move pause restore to dismiss

and fix the condition
2023-01-23 17:46:03 -08:00 · 2023-01-23 17:46:03 -08:00 · 4377065081
parent 8b98ba5042
commit 4377065081
1 changed files with 3 additions and 2 deletions
--- a/library/lua/gui.lua
+++ b/library/lua/gui.lua
@ -710,10 +710,11 @@ function ZScreen:init()
    self.defocused = false
 end

-function ZScreen:onDestroy()
+function ZScreen:dismiss()
+    ZScreen.super.dismiss(self)
    if self.force_pause or self.initial_pause then
        -- never go from unpaused to paused, just from paused to unpaused
-        df.global.pause_state = df.global.pause_state or self.saved_pause_state
+        df.global.pause_state = df.global.pause_state and self.saved_pause_state
    end
 end