From df4030e5cfda0f8a68240f897b266deef7d44e51 Mon Sep 17 00:00:00 2001
From: blikblum <blikblum@lazarus-ide.org>
Date: Tue, 5 Jul 2016 12:10:46 +0000
Subject: [PATCH] win32: refactor checks in WM_NCPAINT to avoid redundancy

git-svn-id: trunk@52630 -
---
 lcl/interfaces/win32/win32callback.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lcl/interfaces/win32/win32callback.inc b/lcl/interfaces/win32/win32callback.inc
index 17817ee3af..a7c5b933d5 100644
--- a/lcl/interfaces/win32/win32callback.inc
+++ b/lcl/interfaces/win32/win32callback.inc
@@ -2407,8 +2407,8 @@ begin
     end;
     WM_NCPAINT:
     begin
-      if (lWinControl <> nil) and TWin32ThemeServices(ThemeServices).ThemesEnabled and
-         not (lWinControl is TCustomForm) and (lWinControl is TCustomControl) then
+      if TWin32ThemeServices(ThemeServices).ThemesEnabled and
+        (lWinControl is TCustomControl) and not (lWinControl is TCustomForm) then
       begin
         TWin32ThemeServices(ThemeServices).PaintBorder(lWinControl, True);
         LMessage.Result := 0;