Merge branch 'hotfix/v2.94'

2017-05-22 08:26:11 +02:00
parent a32dcdccb4 b14526771c
commit 400c61929c
1 changed files with 4 additions and 1 deletions
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -1090,7 +1090,10 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
    try:
        datadf['y1'] = datadf.ix[:,yparam1]
    except KeyError:
-        datadf['y1'] = datadf['pace']
+        try:
+            datadf['y1'] = datadf['pace']
+        except KeyError:
+            return ['','<p>No non-zero data in selection</p>','','']
    if yparam2 != 'None':
        try:
 	    datadf['y2'] = datadf.ix[:,yparam2]