diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2006-06-09 07:53:12 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2006-06-09 07:53:12 +0000 |
| commit | 1c8e69c445d1fa76d93258e7b9a49e352a4f1239 (patch) | |
| tree | ef1c4df5387fa5046c76a1a87b0db358fbaeef00 /src/widgets/toolbox.cpp | |
| parent | update Inkscape icon (diff) | |
| download | inkscape-1c8e69c445d1fa76d93258e7b9a49e352a4f1239.tar.gz inkscape-1c8e69c445d1fa76d93258e7b9a49e352a4f1239.zip | |
Handle case of function call faling. Fixes bug 1501150.
(bzr r1189)
Diffstat (limited to 'src/widgets/toolbox.cpp')
| -rw-r--r-- | src/widgets/toolbox.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index cb9557677..ab480ebec 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -2965,16 +2965,19 @@ sp_text_toolbox_family_changed (GtkTreeSelection *selection, GObject *tbl) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - GtkTreeModel *model; + GtkTreeModel *model = 0; GtkWidget *popdown = GTK_WIDGET (g_object_get_data (tbl, "family-popdown-window")); GtkWidget *entry = GTK_WIDGET (g_object_get_data (tbl, "family-entry")); GtkTreeIter iter; - char *family; + char *family = 0; gdk_pointer_ungrab (GDK_CURRENT_TIME); gdk_keyboard_ungrab (GDK_CURRENT_TIME); - gtk_tree_selection_get_selected (selection, &model, &iter); + if ( !gtk_tree_selection_get_selected( selection, &model, &iter ) ) { + return; + } + gtk_tree_model_get (model, &iter, 0, &family, -1); if (g_object_get_data (G_OBJECT (selection), "block")) |