diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c index c4c85ec2..cc56b053 100644 --- a/src/fe-common/core/fe-common-core.c +++ b/src/fe-common/core/fe-common-core.c @@ -462,7 +462,7 @@ void fe_common_core_finish_init(void) gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest) { - const WindowType type = window_item_get_type(dest->window->active); + const WindowType type = dest->window->active ? window_item_get_type(dest->window->active) : WI_ITEM_OTHER; GSList *targets = NULL, *iterator = NULL; gboolean found = FALSE; diff --git a/src/fe-common/core/window-items.c b/src/fe-common/core/window-items.c index 5523b61e..934d66db 100644 --- a/src/fe-common/core/window-items.c +++ b/src/fe-common/core/window-items.c @@ -140,8 +140,6 @@ void window_item_set_active(WINDOW_REC *window, WI_ITEM_REC *item) WindowType window_item_get_type(WI_ITEM_REC *item) { - g_return_val_if_fail(item != NULL, WI_TYPE_OTHER); - const char *type = module_find_id_str("WINDOW ITEM TYPE", item->type); if (!g_ascii_strcasecmp(type, "CHANNEL")) return WI_TYPE_CHANNEL;