projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
psppire-window: Avoid doubled separator in Windows menu.
[pspp]
/
src
/
ui
/
gui
/
find-dialog.c
diff --git
a/src/ui/gui/find-dialog.c
b/src/ui/gui/find-dialog.c
index 1bdf35e422cd86811168a7a26d03aad439d13d71..1a3a0a5c91afcfeb70067d2e29bf56887880eba6 100644
(file)
--- 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_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;
const struct string_comparator *ssc =
(const struct string_comparator *) cmptr;
+ int width;
+
const char *text = var_lookup_value_label (cmptr->var, val);
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);
assert ( cmptr->flags & STR_CMP_LABELS);