Fixed NPE when PBO Prefix is not being set

ArmA-Studio · Mar 10, 2020 · 797218e · 797218e
1 parent b617d53
commit 797218e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Arma.Studio.UiEditor/UI/Converters/ControlTextImageConverter.cs b/Arma.Studio.UiEditor/UI/Converters/ControlTextImageConverter.cs
@@ -17,7 +17,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             if (value is string str)
             {
                 str = str.TrimStart('\\', '/', ' ', '\t');
-                var pbo = (Application.Current as IApp).MainWindow.FileManagement.FirstOrDefault((it) => str.StartsWith(it.FullPath, StringComparison.InvariantCultureIgnoreCase) || str.StartsWith(it.Prefix, StringComparison.InvariantCultureIgnoreCase));
+                var pbo = (Application.Current as IApp).MainWindow.FileManagement.FirstOrDefault((it) => str.StartsWith(it.FullPath, StringComparison.InvariantCultureIgnoreCase) || (!String.IsNullOrWhiteSpace(it.Prefix) && str.StartsWith(it.Prefix, StringComparison.InvariantCultureIgnoreCase)));
                 if (pbo is null)
                 {
                     return null;