- [GUI] bug fixes

RazTools · Nov 25, 2023 · 148969c · 148969c
1 parent 89a3543
commit 148969c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/AssetStudio.GUI/AssetBrowser.cs b/AssetStudio.GUI/AssetBrowser.cs
@@ -57,7 +57,7 @@ private void clear_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));
             foreach (var file in missingFiles)
             {
@@ -98,6 +98,7 @@ private void searchTextBox_KeyPress(object sender, KeyPressEventArgs e)
 
                 _assetEntries = ResourceMap.GetEntries().FindAll(x => x.Matches(filters));
 
+                assetDataGridView.CurrentCell = assetDataGridView[0, 0];
                 assetDataGridView.Rows.Clear();
                 assetDataGridView.RowCount = _assetEntries.Count;
                 assetDataGridView.Refresh();
@@ -159,6 +160,7 @@ private void AssetListView_ColumnHeaderMouseClick(object sender, DataGridViewCel
 
                 _assetEntries = direction == ListSortDirection.Ascending ? _assetEntries.OrderBy(keySelector).ToList() : _assetEntries.OrderByDescending(keySelector).ToList();
 
+                assetDataGridView.CurrentCell = assetDataGridView[0, 0];
                 assetDataGridView.Rows.Clear();
                 assetDataGridView.RowCount = _assetEntries.Count;
                 assetDataGridView.Refresh();

diff --git a/AssetStudio.GUI/MainForm.cs b/AssetStudio.GUI/MainForm.cs
@@ -1437,7 +1437,8 @@ private void StatusStripUpdate(string statusText)
         {
             if (InvokeRequired)
             {
-                BeginInvoke(new Action(() => { toolStripStatusLabel1.Text = statusText; }));
+                var result = BeginInvoke(() => { toolStripStatusLabel1.Text = statusText; });
+                result.AsyncWaitHandle.WaitOne();
             }
             else
             {