Merge pull request #34 from 0matyesz0/main

Fixed issues regarding to searching and packing encoded w3strings.
WolvenKit · Feb 17, 2023 · ed8b1d8 · ed8b1d8
2 parents 8036799 + a90a380
commit ed8b1d8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git 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
@@ -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()
         }
     }
 
-}
+}