X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Ffind-dialog.c;h=1a3a0a5c91afcfeb70067d2e29bf56887880eba6;hb=681f6120a7998b83ccd439068d8c4090de10b9b5;hp=1bdf35e422cd86811168a7a26d03aad439d13d71;hpb=0588c3c250fbb2b63187b782fa08b39d8e2cee06;p=pspp diff --git a/src/ui/gui/find-dialog.c b/src/ui/gui/find-dialog.c index 1bdf35e422..1a3a0a5c91 100644 --- a/src/ui/gui/find-dialog.c +++ b/src/ui/gui/find-dialog.c @@ -119,7 +119,7 @@ do_find (GObject *obj, const struct find_dialog *fd) PSPPIRE_DATA_EDITOR_DATA_VIEW); psppire_data_sheet_goto_case (data_sheet, x); - psppire_data_sheet_show_variable (data_sheet, column); + psppire_data_sheet_goto_variable (data_sheet, column); } } @@ -465,8 +465,13 @@ string_label_compare (const struct comparator *cmptr, const struct string_comparator *ssc = (const struct string_comparator *) cmptr; + int width; + const char *text = var_lookup_value_label (cmptr->var, val); - int width = strlen (text); + if (text == NULL) + return false; + + width = strlen (text); assert ( cmptr->flags & STR_CMP_LABELS);