Move Package::Current() to a try block (#770)

microsoft · May 29, 2019 · 14db3aa · 14db3aa
1 parent 895c668
commit 14db3aa
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/dev/TeachingTip/TeachingTip.cpp b/dev/TeachingTip/TeachingTip.cpp
@@ -1123,17 +1123,22 @@ void TeachingTip::OnPopupOpened(const winrt::IInspectable&, const winrt::IInspec
 
     if (auto const teachingTipPeer = winrt::FrameworkElementAutomationPeer::FromElement(*this).try_as<winrt::TeachingTipAutomationPeer>())
     {
-        auto const appName = []()
+        auto const notificationString = [this]()
         {
-            if (auto&& package = winrt::ApplicationModel::Package::Current())
+            auto const appName = []()
             {
-                return package.DisplayName();
-            }
-            return winrt::hstring{};
-        }();
+                try
+                {
+                    if (auto&& package = winrt::ApplicationModel::Package::Current())
+                    {
+                        return package.DisplayName();
+                    }
+                }
+                catch (...) {}
+
+                return winrt::hstring{};
+            }();
 
-        auto const notificationString = [this, appName]()
-        {
             if (!appName.empty())
             {
                 return StringUtil::FormatString(