Leahnaya/pk3DS
1
0
Fork 0
mirror of https://github.com/kwsch/pk3DS.git synced 2026-08-22 01:35:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix garc unpack exception after unpack

Browse Source 
label object was not provided
Closes #161
This commit is contained in:
Kurt
2017-07-07 17:41:16 -07:00
parent 6976607627
commit 993abf01fc
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pk3DS/GarcUtil.cs
View File

@@ -98,9 +98,12 @@ public static bool garcUnpack(string garcPath, string outPath, bool skipDecompre
if (!supress) WinFormsUtil.Alert("Unpack Successful!", fileCount + " files unpacked from the GARC!");
}
if (label == null)
return true;
if (label.InvokeRequired)
label.Invoke((MethodInvoker)delegate { label.Visible = false; });
else { label.Visible = false; }
else
label.Visible = false;
return true;
}
catch (FileNotFoundException)

4
pk3DS/Main.cs
View File

@@ -1172,7 +1172,7 @@ private bool getGARC(string infile, string outfolder, bool PB, bool bypassExt =
}
try
{
bool success = GarcUtil.garcUnpack(infile, outfolder, bypassExt, PB ? pBar1 : null, null, true, bypassExt);
bool success = GarcUtil.garcUnpack(infile, outfolder, bypassExt, PB ? pBar1 : null, L_Status, true, bypassExt);
updateStatus(string.Format(success ? "Success!" : "Failed!"), false);
threads--;
return success;
@@ -1186,7 +1186,7 @@ private bool setGARC(string outfile, string infolder, int padBytes, bool PB)
try
{
bool success = GarcUtil.garcPackMS(infolder, outfile, Config.GARCVersion, padBytes, PB ? pBar1 : null, null, true);
bool success = GarcUtil.garcPackMS(infolder, outfile, Config.GARCVersion, padBytes, PB ? pBar1 : null, L_Status, true);
threads--;
updateStatus(string.Format(success ? "Success!" : "Failed!"), false);
return success;