Refactor dctype -> divemode

... and repair a failed rebase (sorry).

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/file.c b/file.c
index 42f433950..60de64d2c 100644
--- a/file.c
+++ b/file.c
@@ -540,7 +540,7 @@ int parse_txt_file(const char *filename, const char *csv)
 		value = parse_mkvi_value(memtxt.buffer, "Rig Serial number");
 		dive->dc.deviceid = atoi(value);
 		free(value);
-		dive->dc.dctype = CCR;
+		dive->dc.divemode = CCR;
 		dive->dc.no_o2sensors = 2;
 
 		dive->cylinder[cur_cylinder_index].cylinder_use = OXYGEN;