diff --git a/AssetStudio.GUI/AssetBrowser.cs b/AssetStudio.GUI/AssetBrowser.cs index 4310aca..42e59cd 100644 --- a/AssetStudio.GUI/AssetBrowser.cs +++ b/AssetStudio.GUI/AssetBrowser.cs @@ -113,8 +113,8 @@ namespace AssetStudio.GUI { 0 => assetEntry.Name, 1 => assetEntry.Container, - 2 => assetEntry.PathID, - 3 => assetEntry.Source, + 2 => assetEntry.Source, + 3 => assetEntry.PathID, 4 => assetEntry.Type, _ => "" }; @@ -152,8 +152,8 @@ namespace AssetStudio.GUI { 0 => x => x.Name, 1 => x => x.Container, - 2 => x => x.PathID, - 3 => x => x.Source, + 2 => x => x.Source, + 3 => x => x.PathID, 4 => x => x.Type, _ => x => "" }; diff --git a/AssetStudio.GUI/MainForm.cs b/AssetStudio.GUI/MainForm.cs index a4b817f..2596678 100644 --- a/AssetStudio.GUI/MainForm.cs +++ b/AssetStudio.GUI/MainForm.cs @@ -1425,7 +1425,9 @@ namespace AssetStudio.GUI { if (InvokeRequired) { - BeginInvoke(new Action(() => { progressBar1.Value = value; })); + + var result = BeginInvoke(new Action(() => { progressBar1.Value = value; })); + result.AsyncWaitHandle.WaitOne(); } else {