From 2d1b5d6e0a46cd8d3c89dec7662e28106dee0b88 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Thu, 25 Sep 2003 03:00:30 +0000 Subject: [PATCH] handle the focus_cycle_target being destroyed during cycling --- openbox/focus.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/openbox/focus.c b/openbox/focus.c index 541cf010..1006c725 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -42,13 +42,23 @@ ObClient *focus_cycle_target; static ObIconPopup *focus_cycle_popup; +static void focus_cycle_destructor(ObClient *c) +{ + /* end cycling if the target disappears */ + if (focus_cycle_target == c) + focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE); +} + void focus_startup(gboolean reconfig) { focus_cycle_popup = icon_popup_new(TRUE); - if (!reconfig) + if (!reconfig) { + client_add_destructor((GDestroyNotify) focus_cycle_destructor); + /* start with nothing focused */ focus_set_client(NULL); + } } void focus_shutdown(gboolean reconfig) @@ -58,6 +68,8 @@ void focus_shutdown(gboolean reconfig) icon_popup_free(focus_cycle_popup); if (!reconfig) { + client_remove_destructor((GDestroyNotify) focus_cycle_destructor); + for (i = 0; i < screen_num_desktops; ++i) g_list_free(focus_order[i]); g_free(focus_order); -- 2.39.2