Skip to content

Commit

Permalink
Fix issue where re-loading a changed ARK would find no dinos.
Browse files Browse the repository at this point in the history
Re-loading a changed ARK will now update the current search.
  • Loading branch information
coldino committed Jan 18, 2018
1 parent bda664a commit 246d638
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 18 deletions.
3 changes: 2 additions & 1 deletion LarkatorGUI/ArkReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ public async Task PerformConversion(bool force = false)
await RunArkTools();
ClassMapping.Clear();
}
else if (ClassMapping.Count == 0)

if (ClassMapping.Count == 0)
{
await LoadClassesJson();
}
Expand Down
19 changes: 2 additions & 17 deletions LarkatorGUI/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -265,22 +265,6 @@ private async void SaveSearch_Click(object sender, RoutedEventArgs e)
MarkSearchesChanged();
}

#if OBSOLETE
private async void ProcessNow_Click(object sender, RoutedEventArgs e)
{
if (IsLoading) return;

await ReReadArk(true);
}

private async void WildTamed_Toggle(object sender, RoutedEventArgs e)
{
var btn = (ToggleButton)sender;
arkReaderWild.Tamed = (btn.IsChecked == true);
await ReReadArk(true);
}
#endif

private void AdjustableInteger_MouseWheel(object sender, MouseWheelEventArgs e)
{
var tb = (TextBlock)sender;
Expand Down Expand Up @@ -396,7 +380,8 @@ private async Task ReReadArk(bool force = false)
await PerformConversion(force);
await LoadSearchSpecies();

UpdateSearchResults(new List<SearchCriteria>());
var currentSearch = searchesList.SelectedItems.Cast<SearchCriteria>().ToList();
UpdateSearchResults(currentSearch);
}

private async Task LoadSearchSpecies()
Expand Down

0 comments on commit 246d638

Please sign in to comment.