From 17af06e4e4d25333336581da55b5093f26114cff Mon Sep 17 00:00:00 2001
From: martin <laz.git@mfriebe.de>
Date: Tue, 4 Aug 2020 11:20:02 +0000
Subject: [PATCH] More WSRegister changes by BrunoK. Issue #37360

git-svn-id: trunk@63687 -
---
 lcl/include/customcontrol.inc       | 5 +++++
 lcl/include/scrollingwincontrol.inc | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/lcl/include/customcontrol.inc b/lcl/include/customcontrol.inc
index 94cbd22ffa..601fc2bd7a 100644
--- a/lcl/include/customcontrol.inc
+++ b/lcl/include/customcontrol.inc
@@ -79,9 +79,14 @@ begin
 end;
 
 class procedure TCustomControl.WSRegisterClass;
+const
+  Registered : boolean = False;
 begin
+  if Registered then
+    Exit;
   inherited WSRegisterClass;
   RegisterCustomControl;
+  Registered := True;
 end;
 
 {------------------------------------------------------------------------------
diff --git a/lcl/include/scrollingwincontrol.inc b/lcl/include/scrollingwincontrol.inc
index 5a4f66a8c6..34c80cd275 100644
--- a/lcl/include/scrollingwincontrol.inc
+++ b/lcl/include/scrollingwincontrol.inc
@@ -231,9 +231,14 @@ begin
 end;
 
 class procedure TScrollingWinControl.WSRegisterClass;
+const
+  Registered : boolean = False;
 begin
+  if Registered then
+    Exit;
   inherited WSRegisterClass;
   RegisterScrollingWinControl;
+  Registered := True;
 end;
 
 procedure TScrollingWinControl.ScrollBy(DeltaX, DeltaY: Integer);