diff --git a/DiscImageChef.CommonTypes b/DiscImageChef.CommonTypes index 88268b5c..ce5a8c9b 160000 --- a/DiscImageChef.CommonTypes +++ b/DiscImageChef.CommonTypes @@ -1 +1 @@ -Subproject commit 88268b5cc8cd42713fc808d0f454fa1b38f8adea +Subproject commit ce5a8c9b40dcc579c3afe7ed802ab7f3183b1562 diff --git a/DiscImageChef.Server/Areas/Admin/Controllers/ReportsController.cs b/DiscImageChef.Server/Areas/Admin/Controllers/ReportsController.cs index de0d0c59..bf255f9b 100644 --- a/DiscImageChef.Server/Areas/Admin/Controllers/ReportsController.cs +++ b/DiscImageChef.Server/Areas/Admin/Controllers/ReportsController.cs @@ -256,6 +256,24 @@ namespace DiscImageChef.Server.Areas.Admin.Controllers _context.Update(masterReport); } + if(masterReport.SCSI?.SequentialDeviceId != null && + masterReport.SCSI?.SequentialDeviceId != slaveReport.SCSI?.SequentialDeviceId) + { + foreach(TestedSequentialMedia testedMedia in + _context.TestedSequentialMedia.Where(d => d.SscId == slaveReport.SCSI.SequentialDeviceId)) + { + testedMedia.SscId = masterReport.SCSI.SequentialDeviceId; + _context.Update(testedMedia); + } + } + else if(masterReport.SCSI != null && + masterReport.SCSI?.SequentialDeviceId == null && + slaveReport.SCSI?.SequentialDeviceId != null) + { + masterReport.SCSI.SequentialDeviceId = slaveReport.SCSI.SequentialDeviceId; + _context.Update(masterReport); + } + _context.Remove(slaveReport); _context.SaveChanges();