From 30316e8a208c814809b23ef73491903b51da61da Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Thu, 2 Feb 2023 06:52:35 +0100 Subject: [PATCH] Fix crash issue Changes are from https://github.com/PhilJay/MPAndroidChart/pull/5376 --- .../main/java/com/github/mikephil/charting/charts/Chart.java | 2 +- .../java/com/github/mikephil/charting/charts/CombinedChart.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java index 4de986e710..8ea56d6cfd 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java @@ -751,7 +751,7 @@ protected void drawMarkers(Canvas canvas) { Entry e = mData.getEntryForHighlight(highlight); // make sure entry not null before using it - if (e == null) { + if (e == null || set == null) { continue; } 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 8d08f59456..ab4504abaf 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 @@ -240,7 +240,7 @@ protected void drawMarkers(Canvas canvas) { IDataSet set = mData.getDataSetByHighlight(highlight); Entry e = mData.getEntryForHighlight(highlight); - if (e == null) { + if (e == null || set == null) { continue; }