diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/CombinedChart.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/CombinedChart.java index 8c1d5a5fed..40b7d5b70a 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/CombinedChart.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/CombinedChart.java @@ -261,11 +261,13 @@ protected void drawMarkers(Canvas canvas) { } // callbacks to update the content - IMarker markerItem = mMarkers.get(i % mMarkers.size()); - markerItem.refreshContent(e, highlight); + if (!mMarkers.isEmpty()) { + IMarker markerItem = mMarkers.get(i % mMarkers.size()); + markerItem.refreshContent(e, highlight); - // draw the marker - markerItem.draw(canvas, pos[0], pos[1]); + // draw the marker + markerItem.draw(canvas, pos[0], pos[1]); + } } }