Merge branch 'release/v13.87' into master

2020-09-20 21:36:49 +02:00
parent 59c106ffb3 7518d7d334
commit aa8ec5a305
1 changed files with 2 additions and 0 deletions
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1603,6 +1603,8 @@ import rowingdata.tcxtools as tcxtools

 def get_workouttype_from_tcx(filename,workouttype='water'):
    tcxtype = 'rowing'
+    if workouttype in mytypes.otwtypes:
+        return workouttype
    try:
        d = tcxtools.tcx_getdict(filename)
        try: