Merge commit 'HEAD'; branch 'master' into rewrite-sheet

[pspp-builds.git] / src / ui / gui / psppire-data-editor.c

diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c
index 52f7ddfd579e52cc27456852ef67a75fcd9a6648..92250255f501eea0316a023dc44709d7309961c7 100644 (file)
--- a/src/ui/gui/psppire-data-editor.c
+++ b/src/ui/gui/psppire-data-editor.c
@@ -274,6 +274,9 @@ rewidth_variable (GtkWidget *w, gint unit, glong size)
   const PsppireDict *dict = de->data_store->dict;
   struct variable *var = psppire_dict_get_variable (dict, unit);
 
+  if (NULL == var)
+    return;
+
   var_set_display_width (var, size / (float) width_of_m (w));
 }
 
@@ -347,8 +350,13 @@ rewidth_variable_callback (PsppireDict *dict, gint posn, gpointer data)
 
   const struct variable *var = psppire_dict_get_variable (dict, posn);
 
-  psppire_axis_impl_resize (de->haxis, posn, m_width *
-                           var_get_display_width (var));
+  gint var_width = var_get_display_width (var);
+
+  /* Don't allow zero width */
+  if ( var_width < 1 )
+    var_width = 1;
+
+  psppire_axis_impl_resize (de->haxis, posn, m_width * var_width);
 }