summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org>2014-06-03 16:01:48 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-06-03 16:36:14 -0700
commit33223fb2cca9b0b5e104f8a121b5cc5f48996238 (patch)
tree253a5c373d2808da550b3e3dfe2c597cebe068cd
parentfafaf0eef0a72727377738c9c71293272e270107 (diff)
downloadsubsurface-33223fb2cca9b0b5e104f8a121b5cc5f48996238.tar.gz
Fix dive water temperature XML parsing
We parsed it rigth for dive computers, but not for the manually filled per-dive case. The git save seems to have gotten it right. I think this has been broken since the whole "move as much as possible to the dive computer sections", but I didn't actually check. Reported-by: roberto forini <forini.r@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--parse-xml.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/parse-xml.c b/parse-xml.c
index f6806d28a..cef5221db 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -1154,6 +1154,8 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf)
return;
if (MATCH("air.divetemperature", temperature, &dive->airtemp))
return;
+ if (MATCH("water.divetemperature", temperature, &dive->watertemp))
+ return;
nonmatch("dive", name, buf);
}