X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautorecode-dialog.c;h=7b027d9badae5380e8505a007e188ede868318bd;hb=6ee48467ac46bb8553f6fb3782623559affb1b9c;hp=8c771ce222d81e9ad9790dd20a5926cdb1d8a5d4;hpb=d4ae90b2fe74d2d1427afad35d32c9e5584211ed;p=pspp

diff --git a/src/ui/gui/autorecode-dialog.c b/src/ui/gui/autorecode-dialog.c
index 8c771ce222..7b027d9bad 100644
--- a/src/ui/gui/autorecode-dialog.c
+++ b/src/ui/gui/autorecode-dialog.c
@@ -91,7 +91,7 @@ on_change_clicked (GObject *obj, gpointer data)
   struct autorecode *rd = data;
   struct variable *var = NULL;
   struct nlp *nlp;
-  GtkTreeModel *model = GTK_TREE_MODEL (PSPPIRE_VAR_VIEW (rd->var_view)->list);
+  GtkTreeModel *model = psppire_var_view_get_current_model (PSPPIRE_VAR_VIEW (rd->var_view));
   GtkTreeIter iter;
   GtkTreeSelection *selection =
     gtk_tree_view_get_selection (GTK_TREE_VIEW (rd->var_view));
@@ -184,7 +184,6 @@ on_entry_change (struct autorecode *rd)
 	      valid = FALSE;
 	      break;
 	    }
-
 	}
     }
 
@@ -200,7 +199,8 @@ static void
 on_selection_change (GtkTreeSelection *selection, gpointer data)
 {
   struct autorecode *rd = data;
-  GtkTreeModel *model = GTK_TREE_MODEL (PSPPIRE_VAR_VIEW (rd->var_view)->list);
+  GtkTreeModel *model = psppire_var_view_get_current_model (PSPPIRE_VAR_VIEW (rd->var_view));
+
   GList *rows = gtk_tree_selection_get_selected_rows (selection, &model);
 
   if ( rows && !rows->next)
@@ -216,6 +216,7 @@ on_selection_change (GtkTreeSelection *selection, gpointer data)
 
 
       ok = gtk_tree_model_get_iter (model, &iter, (GtkTreePath*) rows->data);
+      g_return_if_fail (ok);
 
       gtk_tree_model_get (model, &iter, 0, &var, -1);