X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=divelist.c;h=cebe6ce9b1ba2dd4ece5751fe757bd7f6c04d274;hb=7930567c275d292b84ded6142e8c78e5b40c5941;hp=eb8f231432a99f33f40a8ca0341aee8a66b14148;hpb=d86623e6a1d48111c03888dd2bfb0273c1319e64;p=ext%2Fsubsurface.git

diff --git a/divelist.c b/divelist.c
index eb8f231..cebe6ce 100644
--- a/divelist.c
+++ b/divelist.c
@@ -335,6 +335,14 @@ static int calculate_sac(struct dive *dive)
 	return sac * 1000;
 }
 
+void update_cylinder_related_info(struct dive *dive)
+{
+	if(dive != NULL) {
+		dive->sac = calculate_sac(dive);
+		dive->otu = calculate_otu(dive);
+	}
+}
+
 static void get_string(char **str, const char *s)
 {
 	int len;
@@ -343,8 +351,8 @@ static void get_string(char **str, const char *s)
 	if (!s)
 		s = "";
 	len = strlen(s);
-	if (len > 40)
-		len = 40;
+	if (len > 60)
+		len = 60;
 	n = malloc(len+1);
 	memcpy(n, s, len);
 	n[len] = 0;
@@ -452,8 +460,7 @@ static void fill_dive_list(void)
 	for (i = 0; i < dive_table.nr; i++) {
 		struct dive *dive = dive_table.dives[i];
 
-		dive->otu = calculate_otu(dive);
-		dive->sac = calculate_sac(dive);
+		update_cylinder_related_info(dive);
 		gtk_list_store_append(store, &iter);
 		gtk_list_store_set(store, &iter,
 			DIVE_INDEX, i,