GitHub-Mirror/unitswitcher
1
0
Fork 0
mirror of synced 2024-11-22 03:13:51 +00:00
Code Issues Projects Releases Wiki Activity

Fixed: AV when closing Delphi (at least 2007) due to IDE ActionList being destroyed before the package is unloaded

Browse Source
This commit is contained in:
Mark van Renswoude 2008-09-20 09:35:24 +00:00
parent 07d2233efd
commit 88aa236a62
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Lib/D2006/UnitSwitcherD2006.bpl
View File

Binary file not shown.

BIN
Lib/D7/UnitSwitcherD7.bpl
View File

Binary file not shown.

24
Source/BaseSwClient.pas
View File

@ -25,7 +25,7 @@ type
end; end;
TBaseSwitcherHook = class(TObject) TBaseSwitcherHook = class(TComponent)
private private
FHookedActions: TList; FHookedActions: TList;
protected protected
@ -39,8 +39,10 @@ type
procedure OldActionExecute(AAction: TObject); procedure OldActionExecute(AAction: TObject);
procedure OldActionUpdate(AAction: TObject); procedure OldActionUpdate(AAction: TObject);
procedure Notification(AComponent: TComponent; Operation: TOperation); override;
public public
constructor Create(); constructor Create(); reintroduce;
destructor Destroy(); override; destructor Destroy(); override;
end; end;
@ -54,7 +56,7 @@ uses
{ TBaseSwitcherHook } { TBaseSwitcherHook }
constructor TBaseSwitcherHook.Create(); constructor TBaseSwitcherHook.Create();
begin begin
inherited; inherited Create(nil);
FHookedActions := TList.Create(); FHookedActions := TList.Create();
end; end;
@ -123,6 +125,7 @@ begin
AAction.OnUpdate := AOnUpdate; AAction.OnUpdate := AOnUpdate;
FHookedActions.Add(hookedAction); FHookedActions.Add(hookedAction);
AAction.FreeNotification(Self);
end; end;
@ -155,20 +158,25 @@ begin
end; end;
procedure TBaseSwitcherHook.Notification(AComponent: TComponent; Operation: TOperation);
begin
if (Operation = opRemove) and (AComponent is TContainedAction) then
UnhookAction(TContainedAction(AComponent));
end;
procedure TBaseSwitcherHook.UnhookActionIndex(AIndex: Integer); procedure TBaseSwitcherHook.UnhookActionIndex(AIndex: Integer);
var var
hookedAction: PHookedAction; hookedAction: PHookedAction;
action: TContainedAction; action: TContainedAction;
// onExecute: TNotifyEvent;
begin begin
hookedAction := FHookedActions[AIndex]; hookedAction := FHookedActions[AIndex];
action := TContainedAction(hookedAction^.Action); action := TContainedAction(hookedAction^.Action);
// onExecute := action.OnExecute; action.RemoveFreeNotification(Self);
// if onExecute = hookedAction^.NewOnExecute then action.OnExecute := hookedAction^.OldOnExecute;
action.OnExecute := hookedAction^.OldOnExecute; action.OnUpdate := hookedAction^.OldOnUpdate;
action.OnUpdate := hookedAction^.OldOnUpdate;
Dispose(hookedAction); Dispose(hookedAction);
FHookedActions.Delete(AIndex); FHookedActions.Delete(AIndex);