From 394d9c80aad96ba564f6a0193a101d9dfdd6bdfc Mon Sep 17 00:00:00 2001 From: Shadow Date: Fri, 18 Mar 2022 15:31:12 -0400 Subject: [PATCH] Fix GUI packing --- Zamboni/Form1.cs | 7 ++++--- Zamboni/NicerForm.cs | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Zamboni/Form1.cs b/Zamboni/Form1.cs index 1c8747c..7b37c19 100644 --- 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 index 900abbe..9bcf284 100644 --- 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)