From 76c95e8c47f39c662efa07f16882116b40cd59b3 Mon Sep 17 00:00:00 2001
From: Zaher Dirkey <zaherdirkey@yahoo.com>
Date: Fri, 18 Mar 2022 18:18:54 +0200
Subject: [PATCH] make TPopupNotifier.BidiMode as Application.BidiMode Just
 simple logical fix a crash ADragObjectCopy

---
 lcl/include/dragmanager.inc | 2 +-
 lcl/popupnotifier.pas       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lcl/include/dragmanager.inc b/lcl/include/dragmanager.inc
index 453483394a..3507b5a5e0 100644
--- a/lcl/include/dragmanager.inc
+++ b/lcl/include/dragmanager.inc
@@ -261,7 +261,7 @@ begin
 
   finally
     //erase global variables (dragging stopped)
-    if ADragObjectCopy.AutoFree then
+    if (ADragObjectCopy <>nil) and ADragObjectCopy.AutoFree then
       ADragObjectCopy.Free;
   end;
 end;
diff --git a/lcl/popupnotifier.pas b/lcl/popupnotifier.pas
index 759bf6423c..0b9ad789ff 100644
--- a/lcl/popupnotifier.pas
+++ b/lcl/popupnotifier.pas
@@ -451,6 +451,8 @@ begin
   inherited Create(AOwner);
 
   vNotifierForm := TNotifierForm.Create(nil);
+  if Application <> nil then
+     vNotifierForm.BidiMode := Application.BidiMode;
   vNotifierForm.Visible := False;
 end;