From 2ebdf2a994bbfa2711142d96cb82ae60bada8eb8 Mon Sep 17 00:00:00 2001 From: wp Date: Tue, 3 Nov 2020 08:49:01 +0000 Subject: [PATCH] TAChart: Fix crash if a series refers to a non-existing chartstyle. git-svn-id: trunk@64101 - --- components/tachart/tacustomseries.pas | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/components/tachart/tacustomseries.pas b/components/tachart/tacustomseries.pas index 9fc6bb3843..e006c81c03 100644 --- a/components/tachart/tacustomseries.pas +++ b/components/tachart/tacustomseries.pas @@ -1448,6 +1448,7 @@ var ps, saved_ps: TSeriesPointerStyle; brushAlreadySet: boolean; c: TColor; + style: TChartStyle; begin Assert(Pointer <> nil, 'Series pointer'); if (not Pointer.Visible) or (Length(FGraphPoints) = 0) then exit; @@ -1465,7 +1466,12 @@ begin Pointer.SetOwner(nil); // avoid recursion Pointer.Style := ps; end; - brushAlreadySet := (Styles <> nil) and Styles.StyleByIndex(AStyleIndex).UseBrush; + brushAlreadySet := false; + if (Styles <> nil) then + begin + style := Styles.StyleByIndex(AStyleIndex); + if style <> nil then brushAlreadySet := style.UseBrush; + end; if brushAlreadySet then Styles.Apply(ADrawer, AStyleIndex); if UseDataColors then c := Source[i]^.Color else c := clTAColor;