Skip to content

Commit 797218e

Browse files
committed
Fixed NPE when PBO Prefix is not being set
1 parent b617d53 commit 797218e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Arma.Studio.UiEditor/UI/Converters/ControlTextImageConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
1717
if (value is string str)
1818
{
1919
str = str.TrimStart('\\', '/', ' ', '\t');
20-
var pbo = (Application.Current as IApp).MainWindow.FileManagement.FirstOrDefault((it) => str.StartsWith(it.FullPath, StringComparison.InvariantCultureIgnoreCase) || str.StartsWith(it.Prefix, StringComparison.InvariantCultureIgnoreCase));
20+
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)));
2121
if (pbo is null)
2222
{
2323
return null;

0 commit comments

Comments
 (0)