Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Handle format exception raised by Convert.ToInt32 #13749

Merged
merged 3 commits into from
Nov 8, 2023
Merged

Fix: Handle format exception raised by Convert.ToInt32 #13749

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ecfc27
Handle format exception raised by Convert.ToInt32. Include backup con…
dragoni7 Nov 8, 2023
a68c0b2
Add try catch to DisplayFunction.Invoke()
gave92 Nov 8, 2023
a469f6f
Merge pull request #1 from gave92/rev_exc1
dragoni7 Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions src/Files.App/ViewModels/Properties/Items/FileProperty.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ private IValueConverter GetConverter()
/// Converts the property to a string to be displayed
/// </summary>
/// <returns></returns>
private string ConvertToString()
private string? ConvertToString()
{
// Don't attempt any convert null values
if (Value is null)
Expand All @@ -227,13 +227,27 @@ private string ConvertToString()

if (EnumeratedList is not null)
{
var value = "";
return EnumeratedList.TryGetValue(Convert.ToInt32(Value), out value) ? value.GetLocalizedResource() : null;
try
{
return EnumeratedList.TryGetValue(Convert.ToInt32(Value), out var value) ?
value.GetLocalizedResource() : null;
}
catch
{
return null;
}
}

if (DisplayFunction is not null)
{
return DisplayFunction.Invoke(Value);
try
{
return DisplayFunction.Invoke(Value);
}
catch
{
return null;
}
}

if (Converter is not null)
Expand Down