X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=statistics.c;h=0f6fbe0478c2056a27107ac4d7044613bc296a79;hb=38f92f780ac3a9345bcb34d297ade0eadbd903ea;hp=19105653c2aa1ad8014cfa095dd86bf524f940fc;hpb=4033625567eafbb2c3c69da9189a0b0c87b74abc;p=ext%2Fsubsurface.git

diff --git a/statistics.c b/statistics.c
index 1910565..0f6fbe0 100644
--- a/statistics.c
+++ b/statistics.c
@@ -142,25 +142,25 @@ static void process_all_dives(struct dive *dive, struct dive **prev_dive)
 	}
 }
 
-void process_selected_dives(GList *selected_dives, GtkTreeModel *model)
+/* make sure we skip the selected summary entries */
+void process_selected_dives(GList *selected_dives, int *selectiontracker, GtkTreeModel *model)
 {
 	struct dive *dp;
 	unsigned int i;
-	GtkTreeIter iter;
-	GtkTreePath *path;
+	int idx;
 
 	memset(&stats_selection, 0, sizeof(stats_selection));
-	stats_selection.selection_size = amount_selected;
 
 	for (i = 0; i < amount_selected; ++i) {
-		GValue value = {0, };
-		path = g_list_nth_data(selected_dives, i);
-		if (gtk_tree_model_get_iter(model, &iter, path)) {
-			gtk_tree_model_get_value(model, &iter, 0, &value);
-			dp = get_dive(g_value_get_int(&value));
+		idx = selectiontracker[i];
+		if (idx > 0) {
+			dp = get_dive(idx);
+			if (dp) {
+				process_dive(dp, &stats_selection);
+			}
 		}
-		process_dive(dp, &stats_selection);
 	}
+	stats_selection.selection_size = amount_selected;
 }
 
 static void set_label(GtkWidget *w, const char *fmt, ...)
@@ -274,10 +274,7 @@ static void show_total_dive_stats(struct dive *dive)
 	const char *unit;
 	stats_t *stats_ptr;
 
-	if (amount_selected < 2)
-		stats_ptr = &stats;
-	else
-		stats_ptr = &stats_selection;
+	stats_ptr = &stats_selection;
 
 	set_label(stats_w.selection_size, "%d", stats_ptr->selection_size);
 	if (stats_ptr->min_temp) {