From 14db3aa6c9669043dde682d9b9bd2361c04c7f67 Mon Sep 17 00:00:00 2001 From: Stephen L Peters Date: Wed, 29 May 2019 16:04:23 -0700 Subject: [PATCH] Move Package::Current() to a try block (#770) --- dev/TeachingTip/TeachingTip.cpp | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dev/TeachingTip/TeachingTip.cpp b/dev/TeachingTip/TeachingTip.cpp index 1f07226a95..4017e89290 100644 --- 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()) { - 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(