dschick/git_brcal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid crash if delete is tried on deleted object

Browse Source
This commit is contained in:
Daniel Schick 2024-04-18 15:36:15 +02:00
parent 75585153d4
commit bedf68c4d5
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/BreCalClient/ShipListDialog.xaml.cs
View File

@ -47,7 +47,9 @@ namespace BreCalClient
{ {
if (obj is ShipModel shipmodel) if (obj is ShipModel shipmodel)
{ {
if(this.ShipApi != null) if (!shipmodel.Ship.Deleted)
{
if (this.ShipApi != null)
await this.ShipApi.ShipDeleteAsync(shipmodel.Ship.Id); await this.ShipApi.ShipDeleteAsync(shipmodel.Ship.Id);
BreCalLists.Ships.Remove(shipmodel); // remove from "selectable" ships BreCalLists.Ships.Remove(shipmodel); // remove from "selectable" ships
shipmodel.Ship.Deleted = true; // set deleted marker on working instance shipmodel.Ship.Deleted = true; // set deleted marker on working instance
@ -55,6 +57,7 @@ namespace BreCalClient
this.dataGridShips.ItemsSource = BreCalLists.AllShips; this.dataGridShips.ItemsSource = BreCalLists.AllShips;
} }
} }
}
private async void DataGridShips_EditRequested(object obj) private async void DataGridShips_EditRequested(object obj)
{ {