[UWP] Fix cirucular reference in element tag

microsoft · Sep 27, 2019 · 8881066 · 8881066
1 parent a52ec34
commit 8881066
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/source/uwp/Renderer/lib/ElementTagContent.cpp b/source/uwp/Renderer/lib/ElementTagContent.cpp
@@ -4,6 +4,7 @@
 #include "pch.h"
 #include "ElementTagContent.h"
 
+using namespace Microsoft::WRL;
 using namespace ABI::AdaptiveNamespace;
 using namespace ABI::Windows::UI::Xaml;
 using namespace ABI::Windows::UI::Xaml::Controls;
@@ -16,8 +17,10 @@ namespace AdaptiveNamespace
                                                       _In_ IColumnDefinition* columnDefinition,
                                                       _In_ boolean expectedVisibility)
     {
+        ComPtr<IPanel> localParentPanel(parentPanel);
+        RETURN_IF_FAILED(localParentPanel.AsWeak(&m_parentPanel));
+
         m_columnDefinition = columnDefinition;
-        m_parentPanel = parentPanel;
         m_separator = separator;
         m_cardElement = cardElement;
         m_expectedVisibility = expectedVisibility;

diff --git a/source/uwp/Renderer/lib/ElementTagContent.h b/source/uwp/Renderer/lib/ElementTagContent.h
@@ -40,7 +40,7 @@ namespace AdaptiveNamespace
         Microsoft::WRL::ComPtr<ABI::AdaptiveNamespace::IAdaptiveCardElement> m_cardElement;
         Microsoft::WRL::ComPtr<ABI::Windows::UI::Xaml::Controls::IColumnDefinition> m_columnDefinition;
         Microsoft::WRL::ComPtr<ABI::Windows::UI::Xaml::IUIElement> m_separator;
-        Microsoft::WRL::ComPtr<ABI::Windows::UI::Xaml::Controls::IPanel> m_parentPanel;
+        Microsoft::WRL::WeakRef m_parentPanel;
         boolean m_expectedVisibility;
     };
 }
diff --git a/source/uwp/Renderer/lib/RenderedAdaptiveCard.cpp b/source/uwp/Renderer/lib/RenderedAdaptiveCard.cpp
@@ -240,7 +240,10 @@ namespace AdaptiveNamespace
 
         for (auto parentPanel : parentPanels)
         {
-            XamlHelpers::SetSeparatorVisibility(parentPanel);
+            if (parentPanel)
+            {
+                XamlHelpers::SetSeparatorVisibility(parentPanel);
+            }
         }
 
         return S_OK;