zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-22 10:02:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Move assertion to callpoint to work around assertion fail errors

Browse source
This commit is contained in:
Jari Matilainen 2017-03-29 14:15:10 +02:00
commit 2c7d58586b
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/fe-common/core/fe-common-core.c
View file

@ -462,7 +462,7 @@ void fe_common_core_finish_init(void)
gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest) 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; GSList *targets = NULL, *iterator = NULL;
gboolean found = FALSE; gboolean found = FALSE;

2
src/fe-common/core/window-items.c
View file

@ -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) 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); const char *type = module_find_id_str("WINDOW ITEM TYPE", item->type);
if (!g_ascii_strcasecmp(type, "CHANNEL")) if (!g_ascii_strcasecmp(type, "CHANNEL"))
return WI_TYPE_CHANNEL; return WI_TYPE_CHANNEL;