Fix GUI packing

Shadowth117 · Mar 18, 2022 · 394d9c8 · 394d9c8
1 parent ea706ae
commit 394d9c8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Zamboni/Form1.cs b/Zamboni/Form1.cs
@@ -559,7 +559,8 @@ public static StringBuilder ListIce(string basePath, string currFile)
             }
             extension = extension.Replace("?", "");
 
-            var stringOut = currFile.Replace(basePath, "") + " " + extension;
+            var path = currFile.Replace(basePath, "");
+            var stringOut = path + " " + extension;
             stringOut = stringOut.Substring(1);
             sb.AppendLine(stringOut);
 #if DEBUG
@@ -582,7 +583,7 @@ public static StringBuilder ListIce(string basePath, string currFile)
                         sb.AppendLine("  Group 1 Contents:");
                         foreach (var file in iceFile.groupOneFiles)
                         {
-                            sb.AppendLine("    " + IceFile.getFileName(file));
+                            sb.AppendLine("    " + path + " " + IceFile.getFileName(file));
                         }
                     }
 
@@ -591,7 +592,7 @@ public static StringBuilder ListIce(string basePath, string currFile)
                         sb.AppendLine("  Group 2 Contents:");
                         foreach (var file in iceFile.groupTwoFiles)
                         {
-                            sb.AppendLine("    " + IceFile.getFileName(file));
+                            sb.AppendLine("    " + path + " " + IceFile.getFileName(file));
                         }
                     }
                 }

diff --git a/Zamboni/NicerForm.cs b/Zamboni/NicerForm.cs
@@ -76,7 +76,7 @@ private void packIceButton_Click(object sender, EventArgs e)
                 return;
             UILogic.packIceFromDirectoryToFile(batchFolderBrowserDialog.FileName, 
                 UILogic.ReadWhiteList(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "group1.txt")),
-                searchSubCheck.Checked, useGroupFolders.Checked, false, false);
+                searchSubCheck.Checked, false, useGroupFolders.Checked, false, null);
         }
 
         private void batchListIceContentsButton_Click(object sender, EventArgs e)