From 32c4d1458870bdbcdbed1b47f23c2957af1f8f3d Mon Sep 17 00:00:00 2001 From: John Ralls Date: Thu, 10 Nov 2016 13:56:09 -0800 Subject: [PATCH] Ensure that the Namespace combo box is initialized to a valid iter. Thanks to David T. for noticing that it wasn't. --- src/gnome-utils/dialog-commodity.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gnome-utils/dialog-commodity.c b/src/gnome-utils/dialog-commodity.c index ca3c564921..a30ffd6b64 100644 --- a/src/gnome-utils/dialog-commodity.c +++ b/src/gnome-utils/dialog-commodity.c @@ -646,6 +646,7 @@ gnc_ui_update_namespace_picker (GtkWidget *cbwe, GtkTreeModel *model; GtkTreeIter iter, match; GList *namespaces, *node; + gboolean matched = FALSE; g_return_if_fail(GTK_IS_COMBO_BOX (cbwe)); @@ -653,8 +654,6 @@ gnc_ui_update_namespace_picker (GtkWidget *cbwe, combo_box = GTK_COMBO_BOX(cbwe); model = gtk_combo_box_get_model(combo_box); gtk_list_store_clear(GTK_LIST_STORE(model)); - gtk_tree_model_get_iter_first(model, &match); - gtk_combo_box_set_active_iter(combo_box, &match); /* fetch a list of the namespaces */ switch (mode) @@ -698,9 +697,14 @@ gnc_ui_update_namespace_picker (GtkWidget *cbwe, } if (init_string && (g_utf8_collate(node->data, init_string) == 0)) + { + matched = TRUE; match = iter; + } } + if (!matched) + gtk_tree_model_get_iter_first(model, &match); gtk_combo_box_set_active_iter(combo_box, &match); g_list_free(namespaces); }