diff --git a/WolvenKit.App/ViewModels/MainViewModel.cs b/WolvenKit.App/ViewModels/MainViewModel.cs index 8321a5d0..00c3970c 100644 --- a/WolvenKit.App/ViewModels/MainViewModel.cs +++ b/WolvenKit.App/ViewModels/MainViewModel.cs @@ -845,9 +845,9 @@ await t.ContinueWith(antecedent => var files = Directory.GetFiles((ActiveMod.ProjectDirectory + "\\strings")).Where(s => Path.GetExtension(s) == ".w3strings").ToList(); if (packsettings.Strings.Item1) - files.ForEach(x => File.Copy(x, Path.Combine(ActiveMod.PackedDlcDirectory, Path.GetFileName(x)))); - if (packsettings.Strings.Item2) files.ForEach(x => File.Copy(x, Path.Combine(ActiveMod.PackedModDirectory, Path.GetFileName(x)))); + if (packsettings.Strings.Item2) + files.ForEach(x => File.Copy(x, Path.Combine(ActiveMod.PackedDlcDirectory, Path.GetFileName(x)))); } #endregion MainController.Get().StatusProgress = 90; diff --git a/WolvenKit/Forms/frmStringsGuiImporter.cs b/WolvenKit/Forms/frmStringsGuiImporter.cs index 930b39ca..ea17a0d9 100644 --- a/WolvenKit/Forms/frmStringsGuiImporter.cs +++ b/WolvenKit/Forms/frmStringsGuiImporter.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -182,14 +182,20 @@ private void Search() if (matchCaseSearch) foreach (var str in strings) { - if (str[2].Contains(textBoxSearch.Text)) - results.Add(str); + if (str[2] != null) + { + if (str[2].Contains(textBoxSearch.Text)) + results.Add(str); + } } else foreach (var str in strings) { - if (str[2].ToUpper().Contains(textBoxSearch.Text.ToUpper())) - results.Add(str); + if (str[2] != null) + { + if (str[2].ToUpper().Contains(textBoxSearch.Text.ToUpper())) + results.Add(str); + } } FillListView(results.ToList()); } @@ -214,4 +220,4 @@ private void Import() } } -} \ No newline at end of file +}