changeset 19653:e21002d106ab

merge of '24d23e4d11dd1922afff286215a32a9f006efab2' and '7aeeee20b484c6e7d9e486133b950398c71d3686'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Wed, 05 Sep 2007 12:56:35 +0000
parents 2604ae7c227b (current diff) 21e67147f9f0 (diff)
children 941965d6fd88 1d2002a5735e bced1f19cb1d
files
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/finch/libgnt/gntmenu.c	Wed Sep 05 06:24:35 2007 +0000
+++ b/finch/libgnt/gntmenu.c	Wed Sep 05 12:56:35 2007 +0000
@@ -221,8 +221,13 @@
 {
 	/* check for a trigger key */
 	GList *iter;
+	GList *find;
 	GList *nth = g_list_find(menu->list, gnt_tree_get_selection_data(GNT_TREE(menu)));
-	GList *find = find_item_with_trigger(nth->next, NULL, trigger);
+
+	if (nth == NULL)
+		return FALSE;
+		
+	find = find_item_with_trigger(nth->next, NULL, trigger);
 	if (!find)
 		find = find_item_with_trigger(menu->list, nth->next, trigger);
 	if (!find)