Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion source/uwp/SharedRenderer/lib/XamlBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,18 @@ namespace AdaptiveCards::Rendering::Xaml_Rendering
throw ex;
}

std::tie(newControl, renderedElement) = XamlHelpers::RenderFallback(element, renderContext, renderArgs);
try
{
std::tie(newControl, renderedElement) = XamlHelpers::RenderFallback(element, renderContext, renderArgs);
}
catch (winrt::hresult_error const& ex)
{
// if we get an E_PERFORM_FALLBACK error again, we should only throw it if `ancestorHasFallBack`
if (ex.code() != E_PERFORM_FALLBACK || (ex.code() == E_PERFORM_FALLBACK && ancestorHasFallback))
{
throw ex;
}
}
}

// If we got a control, add a separator if needed and the control to the parent panel
Expand Down
23 changes: 18 additions & 5 deletions source/uwp/SharedRenderer/lib/XamlHelpers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -333,15 +333,28 @@ namespace AdaptiveCards::Rendering::Xaml_Rendering::XamlHelpers

if (fallbackElementRenderer)
{
fallbackControl = fallbackElementRenderer.Render(fallbackElement, renderContext, renderArgs);

renderedElement = fallbackElement;
try
{
fallbackControl = fallbackElementRenderer.Render(fallbackElement, renderContext, renderArgs);
renderedElement = fallbackElement;
}
catch (winrt::hresult_error const& ex)
{
if (ex.code() == E_PERFORM_FALLBACK)
{
std::tie(fallbackControl, renderedElement) = RenderFallback(fallbackElement, renderContext, renderArgs);
}
else
{
throw(ex);
}
}
}

if (!fallbackControl)
else
{
std::tie(fallbackControl, renderedElement) = RenderFallback(fallbackElement, renderContext, renderArgs);
}

fallbackHandled = true;
break;
}
Expand Down