Fixed missing UPK issue

Also gave decompress.exe logging
RobChiocchio · Oct 19, 2017 · 20ca6b2 · 20ca6b2
1 parent d4d3e80
commit 20ca6b2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Patcher/Patcher/MainWindow.xaml.cs b/Patcher/Patcher/MainWindow.xaml.cs
@@ -22,15 +22,15 @@ public MainWindow()
             //tGUI.Name = "GUIThread";
         }
 
-        private void button_Click(object sender, RoutedEventArgs e) // patch borderlands2
+        public void button_Click(object sender, RoutedEventArgs e) // patch borderlands2
         {
             buttonPatch.IsEnabled = false; //disable button
             //main.patch(); //run the patch function
             ThreadStart patcher = new ThreadStart(main.patch);
             Thread patcherThread = new Thread(patcher);
             patcherThread.SetApartmentState(ApartmentState.STA);
             patcherThread.Start(); //run the patch function
-            buttonPatch.IsEnabled = true; //enable button when done
+            //buttonPatch.IsEnabled = true; //enable button when done
         }
     }
 }
diff --git a/Patcher/Patcher/main.cs b/Patcher/Patcher/main.cs
@@ -6,6 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Popup = System.Windows.MessageBox;
+using System.Windows.Forms;
 
 namespace Patcher
 {
@@ -89,9 +90,9 @@ public static void patch() //the main function
 
                 // -- DECOMPRESS UPK --
                 //var decompressing = System.Diagnostics.Process.Start(decompress, "-game=border -out=" + outputDir + @"\\WillowGame\\CookedPCConsole\\ " + iUPK.FullName); //decompress WillowGame.UPK
-                var decompressing = System.Diagnostics.Process.Start(decompress, "-game=border " + iUPK.FullName); //decompress WillowGame.UPK
+                var decompressing = System.Diagnostics.Process.Start(decompress, "-game=border -log=decompress.log " + '"' + iUPK.FullName + '"'); //decompress WillowGame.UPK
                 decompressing.WaitForExit(); //wait for decompress.exe to finish
-                FileInfo decompressedUPK = new FileInfo(System.IO.Path.Combine(System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location), "unpacked", iUPK.Name));
+                FileInfo decompressedUPK = new FileInfo(System.IO.Path.Combine(System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location), @"unpacked\\", iUPK.Name));
                 try
                 {
                     decompressedUPK.CopyTo(oUPK.FullName, true); //move upk to cookedpcconsole
@@ -149,7 +150,7 @@ public static void patch() //the main function
                 // -- CREATE SHORTCUT --
                 WshShell shell = new WshShell();
                 IWshRuntimeLibrary.IWshShortcut shortcut = shell.CreateShortcut(
-    Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + @"\\Borderlands 2 COOP.lnk") as IWshRuntimeLibrary.IWshShortcut;
+    Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + @"\\Borderlands 2 COOP.lnk") as IWshShortcut;
                 shortcut.Arguments = "-log -debug -codermode -nosplash";
                 shortcut.TargetPath = oBL2.FullName;
                 shortcut.WindowStyle = 1;