diff --git a/src/FlaUI.WebDriver/Controllers/ElementController.cs b/src/FlaUI.WebDriver/Controllers/ElementController.cs index de6b836..22cefd6 100644 --- a/src/FlaUI.WebDriver/Controllers/ElementController.cs +++ b/src/FlaUI.WebDriver/Controllers/ElementController.cs @@ -174,11 +174,11 @@ public async Task IsElementSelected([FromRoute] string sessionId, var isSelected = false; if (element.Patterns.SelectionItem.IsSupported) { - isSelected = element.Patterns.SelectionItem.PatternOrDefault.IsSelected.ValueOrDefault; + isSelected = element.Patterns.SelectionItem.TryGetPattern(out var pattern) && pattern.IsSelected.ValueOrDefault; } else if (element.Patterns.Toggle.IsSupported) { - isSelected = element.Patterns.Toggle.PatternOrDefault.ToggleState.ValueOrDefault == Core.Definitions.ToggleState.On; + isSelected = element.Patterns.Toggle.PatternOrDefault?.ToggleState.ValueOrDefault == Core.Definitions.ToggleState.On; } return await Task.FromResult(WebDriverResult.Success(isSelected)); } diff --git a/src/FlaUI.WebDriver/Controllers/SessionController.cs b/src/FlaUI.WebDriver/Controllers/SessionController.cs index aaa4ef0..e6e8f96 100644 --- a/src/FlaUI.WebDriver/Controllers/SessionController.cs +++ b/src/FlaUI.WebDriver/Controllers/SessionController.cs @@ -91,7 +91,7 @@ public async Task CreateNewSession([FromBody] CreateSessionRequest if (appPath.EndsWith("!App")) { isAppOwnedBySession = true; - return Application.LaunchStoreApp(appPath, appArguments); + return Application.LaunchStoreApp(appPath, appArguments ?? ""); } var processStartInfo = new ProcessStartInfo(appPath, appArguments ?? "");