* Fixed crash when deleting watches (#10075). Patch by Martin Friebe

git-svn-id: trunk@13733 -

debugger/debugger.pp

@@ -270,6 +270,7 @@ type
   private
     FSlave: TBaseBreakPoint;
     function GetDebugger: TDebugger;
+    procedure SetSlave(const ASlave : TBaseBreakPoint);
   protected
     procedure DoChanged; override;
     procedure DoStateChange(const AOldState: TDBGState); virtual;
@@ -278,7 +279,7 @@ type
     constructor Create(ACollection: TCollection); override;
     destructor Destroy; override;
     function GetSourceLine: integer; override;
-    property Slave: TBaseBreakPoint read FSlave write FSlave;
+    property Slave: TBaseBreakPoint read FSlave write SetSlave;
   end;
   TDBGBreakPointClass = class of TDBGBreakPoint;
 
@@ -478,6 +479,7 @@ type
   private
     FSlave: TBaseWatch;
     function GetDebugger: TDebugger;
+    procedure SetSlave(const ASlave : TBaseWatch);
   protected
     procedure DoChanged; override;
     procedure DoChange; virtual;
@@ -486,7 +488,7 @@ type
   public
     constructor Create(ACollection: TCollection); override;
     destructor Destroy; override;
-    property Slave: TBaseWatch read FSlave write FSlave;
+    property Slave: TBaseWatch read FSlave write SetSlave;
   end;
   TDBGWatchClass = class of TDBGWatch;
 
@@ -2015,7 +2017,8 @@ begin
   SBP := FSlave;
   FSlave := nil;
   if SBP <> nil
-  then SBP.Changed;
+  then SBP.DoChanged;   // In case UpdateCount  0
+
   inherited Destroy;
 end;
 
@@ -2054,6 +2057,12 @@ begin
   Result := TDBGBreakPoints(Collection).FDebugger;
 end;
 
+procedure TDBGBreakPoint.SetSlave(const ASlave : TBaseBreakPoint);
+begin
+  Assert(FSlave = nil, 'TDBGBreakPoint.SetSlave already has a slave');
+  FSlave := ASlave;
+end;
+
 { =========================================================================== }
 { TIDEBreakPoints }
 { =========================================================================== }
@@ -2647,7 +2656,7 @@ begin
   SW := FSlave;
   FSlave := nil;
   if SW <> nil
-  then SW.Changed;
+  then SW.DoChanged; // in case UpDateCount was 0
   inherited Destroy;
 end;
 
@@ -2671,6 +2680,12 @@ begin
   Result := TDBGWatches(Collection).FDebugger;
 end;
 
+procedure TDBGWatch.SetSlave(const ASlave : TBaseWatch);
+begin
+  Assert(FSlave = nil, 'TDBGWatch.SetSlave already has a slave');
+  FSlave := ASlave;
+end;
+
 { =========================================================================== }
 { TBaseWatches }
 { =========================================================================== }

ide/debugmanager.pas

@@ -207,7 +207,6 @@ type
     procedure UpdateSourceMarkImage;
     procedure UpdateSourceMarkLineColor;
   public
-    constructor Create(ACollection: TCollection); override;
     destructor Destroy; override;
     procedure ResetMaster;
     function GetSourceLine: integer; override;
@@ -233,12 +232,13 @@ type
     FMaster: TDBGWatch;
   protected
     procedure AssignTo(Dest: TPersistent); override;
+    procedure DoChanged; override;
     function GetValid: TValidState; override;
     function GetValue: String; override;
     procedure SetEnabled(const AValue: Boolean); override;
     procedure SetExpression(const AValue: String); override;
   public
-    constructor Create(ACollection: TCollection); override;
+    destructor Destroy; override;
     procedure ResetMaster;
   end;
 
@@ -255,6 +255,7 @@ type
     procedure NotifyRemove(const AWatch: TIDEWatch); override;
   public
     constructor Create(const AManager: TDebugManager);
+    destructor Destroy; override;
     property Master: TDBGWatches read FMaster write SetMaster;
   end;
   
@@ -294,7 +295,6 @@ type
   protected
     procedure AssignTo(Dest: TPersistent); override;
   public
-    constructor Create(ACollection: TCollection); override;
     procedure ResetMaster;
   end;
 
@@ -315,7 +315,6 @@ type
   protected
     procedure DoChanged; override;
   public
-    constructor Create(ACollection: TCollection); override;
     procedure ResetMaster;
   end;
 
@@ -465,11 +464,22 @@ begin
   if (TManagedWatches(GetOwner).FMaster <> nil)
   and (Dest is TDBGWatch)
   then begin
+    Assert(FMaster=nil, 'TManagedWatch.AssignTo already has a master');
+    if FMaster<>nil then FMaster.Slave := nil;
     FMaster := TDBGWatch(Dest);
     FMaster.Slave := Self;
   end;
 end;
 
+procedure TManagedWatch.DoChanged;
+begin
+  if (FMaster <> nil)
+  and (FMaster.Slave = nil)
+  then FMaster := nil;
+
+  inherited DoChanged;
+end;
+
 function TManagedWatch.GetValid: TValidState;
 begin
   if FMaster = nil
@@ -498,13 +508,15 @@ begin
   if FMaster <> nil then FMaster.Expression := AValue;
 end;
 
-constructor TManagedWatch.Create(ACollection: TCollection);
+destructor TManagedWatch.Destroy;
 begin
-  inherited Create(ACollection);
+  ResetMaster;
+  inherited Destroy;
 end;
 
 procedure TManagedWatch.ResetMaster;
 begin
+  if FMaster <> nil then FMaster.Slave := nil;
   FMaster := nil;
 end;
 
@@ -561,14 +573,14 @@ begin
   inherited Create(TManagedWatch);
 end;
 
-{ TManagedException }
-
-constructor TManagedException.Create(ACollection: TCollection);
+destructor TManagedWatches.Destroy;
 begin
-  FMaster := nil;
-  inherited Create(ACollection);
+  if Master <> nil then FMaster.OnChange := nil;
+  inherited Destroy;
 end;
 
+{ TManagedException }
+
 procedure TManagedException.DoChanged;
 var
   E: TDBGExceptions;
@@ -636,12 +648,6 @@ begin
   end;
 end;
 
-constructor TManagedSignal.Create(ACollection: TCollection);
-begin
-  FMaster := nil;
-  inherited Create(ACollection);
-end;
-
 procedure TManagedSignal.ResetMaster;
 begin
   FMaster := nil;
@@ -807,17 +813,13 @@ begin
   if (TManagedBreakPoints(GetOwner).FMaster <> nil)
   and (Dest is TDBGBreakPoint)
   then begin
+    Assert(FMaster=nil, 'TManagedBreakPoint.AssignTO already has Master');
+    if FMaster <> nil then FMaster.Slave := nil;
     FMaster := TDBGBreakPoint(Dest);
     FMaster.Slave := Self;
   end;
 end;
 
-constructor TManagedBreakPoint.Create(ACollection: TCollection);
-begin
-  inherited Create(ACollection);
-  FMaster := nil;
-end;
-
 destructor TManagedBreakPoint.Destroy;
 begin
   if FMaster <> nil
@@ -854,6 +856,7 @@ end;
 
 procedure TManagedBreakPoint.ResetMaster;
 begin
+  if FMaster <> nil then FMaster.Slave := nil;
   FMaster := nil;
   Changed;
 end;