Minor tweaks

Author: joachim.marder

Lib/UIRibbonActions.pas

@@ -305,8 +305,8 @@ procedure TUICommandRecentItemsActionLink.CommandSelect(
     Self.Selected.Description := (lItem as TUIRecentItem).Description;
     Self.Selected.Pinned := (lItem as TUIRecentItem).Pinned;
 
-  if Assigned(Action) then
-    Action.Execute;
+    if Assigned(Action) then
+      Action.Execute;
   finally
     FreeAndNil(fSelected);
   end;

Lib/UIRibbonCommands.pas

@@ -1595,6 +1595,7 @@ function GetProperty(const Key: TUIPropertyKey): TUIProperty;
 end;
 
 type
+
   { This notifier is used for delayed notification of TUICommand's of specific
     events. The notification will occur in the next message pump.
 
@@ -1622,14 +1623,17 @@ function GetProperty(const Key: TUIPropertyKey): TUIProperty;
   TNotifierFlag = 0..31;
 
   TNotifier = class
-  {$REGION 'Internal Declarations'}
+  strict private
+    // Type for storing the TUICommands
+    // We use Pointer here as generic type, because for those the hash value is being calculated without using the object instance.
+    // Since the messages are processed delayed, it may happen that the object instance has already been destroyed.
+    type TClients = TDictionary<Pointer, Cardinal>;
   strict private
     FNotificationWindow: HWND;
-    FClients: TDictionary<TUICommand, Cardinal>;
+    FClients: TClients;
   strict private
     procedure WndProc(var Msg: TMessage);
     procedure Notify(const Command: TUICommand; const Flag: TNotifierFlag);
-  {$ENDREGION 'Internal Declarations'}
   public
     constructor Create;
     destructor Destroy; override;
@@ -1656,7 +1660,7 @@ constructor TNotifier.Create;
 begin
   inherited;
   FNotificationWindow := AllocateHWnd(WndProc);
-  FClients := TDictionary<TUICommand, Cardinal>.Create;
+  FClients := TClients.Create();
 end;
 
 destructor TNotifier.Destroy;
@@ -2027,7 +2031,7 @@ procedure TUICommand.Notify(const Flag: Integer);
   Prop: TPair<TUIPropertyKey, TValue>;
   Dec: TDecimal;
 begin
-  if (Flag = NOTIFY_CACHED_PROPERTIES) then
+  if (Flag = NOTIFY_CACHED_PROPERTIES) and Assigned(FCachedProperties) then
   begin
     for Prop in FCachedProperties do
     begin