Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-14 15:56:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix quit-after-last-window-closed=true, quit-after-last-window-closed-delay=null

Browse Source 
The case when `quit-after-last-window-closed=true` and
`quit-after-last-window-closed-delay=null` was broken because control
gets stuck inside `g_main_context_iteration` and never returns to our
code. In that case add a 0ms timer that will return control flow from
GLib back to our code so that we can quit.

Fixes #2039
This commit is contained in:
Jeffrey C. Ollie
2024-08-04 14:33:37 -05:00
parent 5f0371c189
commit 4657f30f7f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/apprt/gtk/App.zig
View File

@ -529,8 +529,8 @@ pub fn startQuitTimer(self: *App) void {
// This is a no-op unless we are configured to quit after last window is closed. // This is a no-op unless we are configured to quit after last window is closed.
if (!self.config.@"quit-after-last-window-closed") return; if (!self.config.@"quit-after-last-window-closed") return;
// If a delay is configured, set a timeout function to quit after the delay.
if (self.config.@"quit-after-last-window-closed-delay") |v| { if (self.config.@"quit-after-last-window-closed-delay") |v| {
// If a delay is configured, set a timeout function to quit after the delay.
const ms: u64 = std.math.divTrunc( const ms: u64 = std.math.divTrunc(
u64, u64,
v.duration, v.duration,
@ -538,6 +538,10 @@ pub fn startQuitTimer(self: *App) void {
) catch std.math.maxInt(c.guint); ) catch std.math.maxInt(c.guint);
const t = std.math.cast(c.guint, ms) orelse std.math.maxInt(c.guint); const t = std.math.cast(c.guint, ms) orelse std.math.maxInt(c.guint);
self.quit_timer = .{ .active = c.g_timeout_add(t, gtkQuitTimerExpired, self) }; self.quit_timer = .{ .active = c.g_timeout_add(t, gtkQuitTimerExpired, self) };
} else {
// If no delay is configured, we still need a 0ms timer to break out of
// g_main_context_iteration so that control returns to our code.
self.quit_timer = .{ .active = c.g_timeout_add(0, gtkQuitTimerExpired, self) };
} }
} }