From 66894acedf5decd65590c1b9d4eca6fa3fbc8250 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Sat, 14 Dec 2019 21:06:16 +0000
Subject: [PATCH] Check if output format supports all disc tags we have
 retrieved so far.

---
 .../Devices/Dumping/CompactDisc.cs            | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs b/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs
index 52448841d..0a7e0608e 100644
--- a/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs
+++ b/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs
@@ -631,6 +631,26 @@ namespace DiscImageChef.Core.Devices.Dumping
                 mediaTags.Add(MediaTagType.CD_TEXT, tmpBuf);
             }
 
+            // Check if output format supports all disc tags we have retrieved so far
+            foreach(MediaTagType tag in mediaTags.Keys)
+            {
+                if(outputPlugin.SupportedMediaTags.Contains(tag))
+                    continue;
+
+                if(!force)
+                {
+                    dumpLog.WriteLine("Output format does not support {0}, continuing...", tag);
+                    ErrorMessage?.Invoke($"Output format does not support {tag}, continuing...");
+                }
+                else
+                {
+                    dumpLog.WriteLine("Output format does not support {0}, not continuing...", tag);
+                    StoppingErrorMessage?.Invoke($"Output format does not support {tag}, not continuing...");
+
+                    return;
+                }
+            }
+
             if(leadOutStarts.Any())
             {
                 UpdateStatus?.Invoke("Solving lead-outs...");
@@ -845,26 +865,6 @@ namespace DiscImageChef.Core.Devices.Dumping
             if(MMC.IsVideoNowColor(videoNowColorFrame))
                 dskType = MediaType.VideoNowColor;
 
-            // Check if output format supports all disc tags we have retrieved so far
-            foreach(MediaTagType tag in mediaTags.Keys)
-            {
-                if(outputPlugin.SupportedMediaTags.Contains(tag))
-                    continue;
-
-                if(!force)
-                {
-                    dumpLog.WriteLine("Output format does not support {0}, continuing...", tag);
-                    ErrorMessage?.Invoke($"Output format does not support {tag}, continuing...");
-                }
-                else
-                {
-                    dumpLog.WriteLine("Output format does not support {0}, not continuing...", tag);
-                    StoppingErrorMessage?.Invoke($"Output format does not support {tag}, not continuing...");
-
-                    return;
-                }
-            }
-
             // Check mode for tracks
             for(int t = 0; t < tracks.Length; t++)
             {