Skip to content

Commit ce14c14

Browse files
committed
Merge #4491 Fix freezing after startup with empty mod list
2 parents d5d11bd + b414cd3 commit ce14c14

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ All notable changes to this project will be documented in this file.
1212

1313
- [Core] Ensure encoding is UTF-8 when saving JSON (#4475, #4478 by: HebaruSan)
1414
- [GUI] Display release date in local time zone (#4488 by: HebaruSan)
15+
- [GUI] Fix freezing after startup with empty mod list (#4491 by: HebaruSan)
1516

1617
### Internal
1718

1819
- [Docs] Update download count image for Minkowski² (#4474 by: Clayell; reviewed: HebaruSan)
19-
- [Netkan] Fix x_netkan_epoch not applied before unreliable server check (#4477 by: HebaruSan)
20+
- [Netkan] Fix `x_netkan_epoch` not applied before unreliable server check (#4477 by: HebaruSan)
2021

2122
## v1.36.2 (Politas)
2223

GUI/Controls/ManageMods.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public ManageMods()
4545
Util.Debounce<EventArgs>((sender, e) => {},
4646
(sender, e) => false,
4747
(sender, e) => false,
48-
ModGrid_SelectionChanged,
48+
(sender, e) => Util.Invoke(this, () => ModGrid_SelectionChanged(sender, e)),
4949
100));
5050

5151
repoData = ServiceLocator.Container.Resolve<RepositoryDataManager>();
@@ -138,7 +138,7 @@ private List<string> SortColumns
138138

139139
private List<bool> descending => guiConfig?.MultiSortDescending ?? new List<bool>();
140140

141-
public event Action<GUIMod>? OnSelectedModuleChanged;
141+
public event Action<GUIMod?>? OnSelectedModuleChanged;
142142
public event Action<List<ModChange>?, Dictionary<GUIMod, string>?>? OnChangeSetChanged;
143143
public event Action? OnRegistryChanged;
144144

@@ -706,9 +706,9 @@ private void ModGrid_SelectionChanged(object? sender, EventArgs? e)
706706
}
707707

708708
var module = SelectedModule;
709+
OnSelectedModuleChanged?.Invoke(module);
709710
if (module != null)
710711
{
711-
OnSelectedModuleChanged?.Invoke(module);
712712
NavSelectMod(module);
713713
}
714714
}

GUI/Main/Main.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ public bool PreFilterMessage(ref Message m)
823823
return false;
824824
}
825825

826-
private void ManageMods_OnSelectedModuleChanged(GUIMod m)
826+
private void ManageMods_OnSelectedModuleChanged(GUIMod? m)
827827
{
828828
if (MainTabControl.SelectedTab == ManageModsTabPage)
829829
{

0 commit comments

Comments
 (0)