From e1f3cb85c0084ed41e36279ace78c0f981239abf Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 18 Sep 2022 08:24:02 +0530 Subject: [PATCH] Window for id should not fail when not called from a callback --- kitty/mouse.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/kitty/mouse.c b/kitty/mouse.c index a9cf6410d..a0b6361e0 100644 --- a/kitty/mouse.c +++ b/kitty/mouse.c @@ -143,12 +143,14 @@ encode_mouse_scroll(Window *w, int button, int mods) { static Window* window_for_id(id_type window_id) { - Tab *t = global_state.callback_os_window->tabs + global_state.callback_os_window->active_tab; - for (unsigned int i = 0; i < t->num_windows; i++) { - Window *w = t->windows + i; - if (w->id == window_id) return w; + if (global_state.callback_os_window && global_state.callback_os_window->tabs) { + Tab *t = global_state.callback_os_window->tabs + global_state.callback_os_window->active_tab; + for (unsigned int i = 0; i < t->num_windows; i++) { + Window *w = t->windows + i; + if (w->id == window_id) return w; + } } - return NULL; + return window_for_window_id(window_id); }