chizui/YarikStudio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- [GUI] bug fixes

Browse Source
This commit is contained in:
Razmoth
2023-11-25 15:29:15 +04:00
parent 89a3543f18
commit 148969c457
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AssetStudio.GUI/AssetBrowser.cs
View File

@@ -57,7 +57,7 @@ namespace AssetStudio.GUI
} }
private void loadSelected_Click(object sender, EventArgs e) private void loadSelected_Click(object sender, EventArgs e)
{ {
var files = assetDataGridView.SelectedRows.Cast<DataGridViewRow>().Select(x => x.DataBoundItem as AssetEntry).Select(x => x.Source).ToHashSet(); var files = assetDataGridView.SelectedRows.Cast<DataGridViewRow>().Select(x => _assetEntries[x.Index]).Select(x => x.Source).ToHashSet();
var missingFiles = files.Where(x => !File.Exists(x)); var missingFiles = files.Where(x => !File.Exists(x));
foreach (var file in missingFiles) foreach (var file in missingFiles)
{ {
@@ -98,6 +98,7 @@ namespace AssetStudio.GUI
_assetEntries = ResourceMap.GetEntries().FindAll(x => x.Matches(filters)); _assetEntries = ResourceMap.GetEntries().FindAll(x => x.Matches(filters));
assetDataGridView.CurrentCell = assetDataGridView[0, 0];
assetDataGridView.Rows.Clear(); assetDataGridView.Rows.Clear();
assetDataGridView.RowCount = _assetEntries.Count; assetDataGridView.RowCount = _assetEntries.Count;
assetDataGridView.Refresh(); assetDataGridView.Refresh();
@@ -159,6 +160,7 @@ namespace AssetStudio.GUI
_assetEntries = direction == ListSortDirection.Ascending ? _assetEntries.OrderBy(keySelector).ToList() : _assetEntries.OrderByDescending(keySelector).ToList(); _assetEntries = direction == ListSortDirection.Ascending ? _assetEntries.OrderBy(keySelector).ToList() : _assetEntries.OrderByDescending(keySelector).ToList();
assetDataGridView.CurrentCell = assetDataGridView[0, 0];
assetDataGridView.Rows.Clear(); assetDataGridView.Rows.Clear();
assetDataGridView.RowCount = _assetEntries.Count; assetDataGridView.RowCount = _assetEntries.Count;
assetDataGridView.Refresh(); assetDataGridView.Refresh();

3
AssetStudio.GUI/MainForm.cs
View File

@@ -1437,7 +1437,8 @@ namespace AssetStudio.GUI
{ {
if (InvokeRequired) if (InvokeRequired)
{ {
BeginInvoke(new Action(() => { toolStripStatusLabel1.Text = statusText; })); var result = BeginInvoke(() => { toolStripStatusLabel1.Text = statusText; });
result.AsyncWaitHandle.WaitOne();
} }
else else
{ {