From 445cc173cedfad81bdda2a256e06fab4521687ca Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Thu, 16 Jul 2020 14:45:51 -0700
Subject: [PATCH] Fix incorrect PIC formatting

---
 DICUI.Library/DiscImageCreator/Parameters.cs | 2 +-
 DICUI.Library/Utilities/DumpEnvironment.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DICUI.Library/DiscImageCreator/Parameters.cs b/DICUI.Library/DiscImageCreator/Parameters.cs
index 04c207de..71d2e9e7 100644
--- a/DICUI.Library/DiscImageCreator/Parameters.cs
+++ b/DICUI.Library/DiscImageCreator/Parameters.cs
@@ -2330,7 +2330,7 @@ namespace DICUI.DiscImageCreator
             try
             {
                 byte[] picBytes = File.ReadAllBytes(picPath);
-                string hex = BitConverter.ToString(picBytes, 0).Replace("-", string.Empty);
+                string hex = BitConverter.ToString(picBytes).Replace("-", string.Empty);
                 return Regex.Replace(hex, ".{32}", "$0\n");
             }
             catch
diff --git a/DICUI.Library/Utilities/DumpEnvironment.cs b/DICUI.Library/Utilities/DumpEnvironment.cs
index 6fe19a76..5a7ac9dc 100644
--- a/DICUI.Library/Utilities/DumpEnvironment.cs
+++ b/DICUI.Library/Utilities/DumpEnvironment.cs
@@ -1078,7 +1078,7 @@ namespace DICUI.Utilities
                 string last = null;
                 for (int i = 0; i < output.Count; )
                 {
-                    if (output[i] == last)
+                    if (output[i] == last && string.IsNullOrWhiteSpace(last))
                     {
                         output.RemoveAt(i);
                     }