From 250625f3ef3134f8901024bf901a69a2f369ea0b Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Tue, 30 Apr 2019 19:12:40 +0100 Subject: [PATCH] Correct device not ready error messages on dumping SCSI. --- DiscImageChef.Core/Devices/Dumping/SCSI.cs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/DiscImageChef.Core/Devices/Dumping/SCSI.cs b/DiscImageChef.Core/Devices/Dumping/SCSI.cs index 6f415874b..11768bae3 100644 --- a/DiscImageChef.Core/Devices/Dumping/SCSI.cs +++ b/DiscImageChef.Core/Devices/Dumping/SCSI.cs @@ -61,9 +61,9 @@ namespace DiscImageChef.Core.Devices.Dumping FixedSense? decSense = Sense.DecodeFixed(senseBuf); if(decSense.HasValue) { - UpdateStatus - ?.Invoke($"Device not ready. Sense {decSense.Value.SenseKey}h ASC {decSense.Value.ASC:X2}h ASCQ {decSense.Value.ASCQ:X2}h"); - dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h", + ErrorMessage + ?.Invoke($"Device not ready. Sense {decSense.Value.SenseKey} ASC {decSense.Value.ASC:X2}h ASCQ {decSense.Value.ASCQ:X2}h"); + dumpLog.WriteLine("Device not ready. Sense {0} ASC {1:X2}h ASCQ {2:X2}h", decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ); // Just retry, for 5 times @@ -86,9 +86,9 @@ namespace DiscImageChef.Core.Devices.Dumping decSense = Sense.DecodeFixed(senseBuf); if(decSense.HasValue) { - UpdateStatus - ?.Invoke($"Device not ready. Sense {decSense.Value.SenseKey}h ASC {decSense.Value.ASC:X2}h ASCQ {decSense.Value.ASCQ:X2}h"); - dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h", + ErrorMessage + ?.Invoke($"Device not ready. Sense {decSense.Value.SenseKey} ASC {decSense.Value.ASC:X2}h ASCQ {decSense.Value.ASCQ:X2}h"); + dumpLog.WriteLine("Device not ready. Sense {0} ASC {1:X2}h ASCQ {2:X2}h", decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ); } @@ -114,8 +114,8 @@ namespace DiscImageChef.Core.Devices.Dumping decSense = Sense.DecodeFixed(senseBuf); if(decSense.HasValue) { - UpdateStatus - ?.Invoke($"Device not ready. Sense {decSense.Value.SenseKey}h ASC {decSense.Value.ASC:X2}h ASCQ {decSense.Value.ASCQ:X2}h"); + ErrorMessage + ?.Invoke($"Device not ready. Sense {decSense.Value.SenseKey} ASC {decSense.Value.ASC:X2}h ASCQ {decSense.Value.ASCQ:X2}h"); dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h", decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ); } @@ -157,8 +157,8 @@ namespace DiscImageChef.Core.Devices.Dumping decSense = Sense.DecodeFixed(senseBuf); if(decSense.HasValue) { - UpdateStatus - ?.Invoke($"Device not ready. Sense {decSense.Value.SenseKey}h ASC {decSense.Value.ASC:X2}h ASCQ {decSense.Value.ASCQ:X2}h"); + ErrorMessage + ?.Invoke($"Device not ready. Sense {decSense.Value.SenseKey} ASC {decSense.Value.ASC:X2}h ASCQ {decSense.Value.ASCQ:X2}h"); dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h", decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ); }