use new dfhack.screen.hideGuar in gui/launcher

myk002 · myk002 · commit ead61beb72ea · 2022-09-10T09:52:14.000-07:00
diff --git a/gui/launcher.lua b/gui/launcher.lua
@@ -515,21 +515,25 @@ function LauncherUI:onDismiss()
     view = nil
 end
 
--- expected to be run under script.start()
-local function safe_run(reappear, command, prev_parent_focus)
-    -- allow our dismissed viewscreen to be removed from the stack. this allows
-    -- hotkey guards and tools that detect the top viewscreen to work reliably.
-    script.sleep(2, 'frames')
-    local output = dfhack.run_command_silent(command)
+function LauncherUI:run_command(reappear, command)
+    command = command:trim()
+    if #command == 0 then return end
+    dfhack.addCommandToHistory(HISTORY_ID, HISTORY_FILE, command)
+    record_command(command)
+    self:dismiss()
+    -- remove our (dismissed) viewscreen from the stack while we run the
+    -- command. this allows hotkey guards and tools that interact with the top
+    -- viewscreen without checking whether it is active to work reliably.
+    local output = dfhack.screen.hideGuard(self, dfhack.run_command_silent,
+                                           command)
     if #output > 0 then
         print('Output from command run from gui/launcher:')
         print('> ' .. command)
         print()
         print(output)
     end
     -- if we displayed a new dfhack screen, don't come back up even if reappear
-    -- is true. otherwise, the user can't interact with the new screen. if we're
-    -- not reappearing with the output, print the output to the console.
+    -- is true so the user can interact with the new screen.
     local parent_focus = dfhack.gui.getCurFocus(true)
     if not reappear or (parent_focus:startswith('dfhack/') and
                         parent_focus ~= prev_parent_focus) then
@@ -540,15 +544,6 @@ local function safe_run(reappear, command, prev_parent_focus)
     launch({initial_help=initial_help})
 end
 
-function LauncherUI:run_command(reappear, text)
-    text = text:trim()
-    if #text == 0 then return end
-    dfhack.addCommandToHistory(HISTORY_ID, HISTORY_FILE, text)
-    record_command(text)
-    self:dismiss()
-    script.start(safe_run, reappear, text, self.parent_focus)
-end
-
 function LauncherUI:getWantedFrameSize()
     local width, height = dfhack.screen.getWindowSize()
     return math.max(76, width-10), math.max(24, height-10)
