From d97dbf63c95c0f68c9aa7783e70ad880d4c8297c Mon Sep 17 00:00:00 2001
From: ondrej <ondrej@lazarus-ide.org>
Date: Thu, 26 Apr 2018 08:26:27 +0000
Subject: [PATCH] LCL: TButtonGlyph: clear ExternalImages on Glyph change and
 assign

git-svn-id: trunk@57719 -
---
 lcl/include/buttonglyph.inc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lcl/include/buttonglyph.inc b/lcl/include/buttonglyph.inc
index 6fa16aa90e..4fed3f1ca0 100644
--- a/lcl/include/buttonglyph.inc
+++ b/lcl/include/buttonglyph.inc
@@ -170,7 +170,12 @@ begin
   if FOriginal = Value then
     exit;
   if FOriginal = nil then
-    FOriginal := TGlyphBitmap.Create(Self);
+    FOriginal := TGlyphBitmap.Create(Self)
+  else
+  begin
+    FExternalImages := nil;
+    FExternalImageIndex := -1;
+  end;
   FOriginal.OnChange := nil;
   FOriginal.Assign(Value);
   FOriginal.OnChange := @GlyphChanged;
@@ -235,6 +240,8 @@ begin
     FImagesCache := GetImageListCache;
     FImagesCache.RegisterListener(Self);
     FImagesCache.RegisterBitmap(Self, FOriginal, NumGlyphs);
+    FExternalImageIndex := -1;
+    FExternalImages := nil;
   end;
 
   if Sender = FOriginal then