Merge pull request #359 from Ewg777/patch-1

Fixes a null pointer crash
ChartsOrg · Sep 16, 2015 · fc0d31d · fc0d31d
2 parents b647053 + a2923a0
commit fc0d31d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Charts/Classes/Charts/BarLineChartViewBase.swift b/Charts/Classes/Charts/BarLineChartViewBase.swift
@@ -1389,7 +1389,7 @@ public class BarLineChartViewBase: ChartViewBase, UIGestureRecognizerDelegate
     {
         var pt = CGPoint(x: viewPortHandler.contentRight, y: viewPortHandler.contentBottom)
         getTransformer(.Left).pixelToValue(&pt)
-        return (Int(pt.x) >= _data.xValCount) ? _data.xValCount - 1 : Int(pt.x)
+        return (_data != nil && Int(pt.x) >= _data.xValCount) ? _data.xValCount - 1 : Int(pt.x)
     }
 
     /// returns the current x-scale factor