[Bugfix] Allows the user to return null (default value) when the return value type is a reference type.
This commit is contained in:
1 parent
82e9577a9f
commit
19d6d1c289
1 file changed
+11
-6
@@ -56,12 +56,17 @@ namespace HandyControl.Controls
|
|||||||
if (!(frameworkElement.DataContext is IDialogResult dialogResult))
|
if (!(frameworkElement.DataContext is IDialogResult dialogResult))
|
||||||
throw new InvalidOperationException("The view model of the dialog is not implement the IDialogResult interface. ");
|
throw new InvalidOperationException("The view model of the dialog is not implement the IDialogResult interface. ");
|
||||||
|
|
||||||
if (!(dialogResult.Result is TResult result))
|
switch (dialogResult.Result)
|
||||||
throw new InvalidCastException("Could not cast " +
|
{
|
||||||
$"the {(dialogResult.Result != null ? $"{dialogResult.Result.GetType()} type" : "null value")} " +
|
case TResult result:
|
||||||
$"to the {typeof(TResult)} type. ");
|
return result;
|
||||||
|
case null when !typeof(TResult).IsValueType:
|
||||||
return result;
|
return default(TResult); // The default value of the value type may cause confusion, so should not help the user decide.
|
||||||
|
default:
|
||||||
|
throw new InvalidCastException("Could not cast " +
|
||||||
|
$"the {(dialogResult.Result != null ? $"{dialogResult.Result.GetType()} type" : "null value")} " +
|
||||||
|
$"to the {typeof(TResult)} type. ");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user