From 40b2351be0ce629dea2aac1d18d2ab5c7c6c2e2a Mon Sep 17 00:00:00 2001
From: pxzleo <pxzleo@126.com>
Date: Fri, 18 Aug 2017 12:16:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96=E5=8C=85?=
 =?UTF-8?q?=E4=BB=A5=E6=94=AF=E6=8C=81release=E7=BC=96=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Plane.Windows.Messages/Alert.cs                      | 10 +++++++++-
 Plane.Windows.Messages/Plane.Windows.Messages.csproj | 10 ++++------
 Plane.Windows.Messages/packages.config               |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Plane.Windows.Messages/Alert.cs b/Plane.Windows.Messages/Alert.cs
index bc69d4a..cd045c1 100644
--- a/Plane.Windows.Messages/Alert.cs
+++ b/Plane.Windows.Messages/Alert.cs
@@ -29,7 +29,15 @@ namespace Plane.Windows.Messages
         {
             if (Dispatcher.CheckAccess())
             {
-                return func();
+                try
+                {
+                    return func();
+                }
+                catch (Exception ex)
+                {
+                    return 0;
+                  }
+
             }
             else
             {
diff --git a/Plane.Windows.Messages/Plane.Windows.Messages.csproj b/Plane.Windows.Messages/Plane.Windows.Messages.csproj
index 813d3a0..16ee93a 100644
--- a/Plane.Windows.Messages/Plane.Windows.Messages.csproj
+++ b/Plane.Windows.Messages/Plane.Windows.Messages.csproj
@@ -30,8 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MahApps.Metro, Version=1.2.2.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
-      <HintPath>..\..\EHang.FormationCreator\packages\MahApps.Metro.1.2.2.0\lib\net40\MahApps.Metro.dll</HintPath>
+    <Reference Include="MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
+      <HintPath>..\..\Plane.FormationCreator\packages\MahApps.Metro.1.5.0\lib\net40\MahApps.Metro.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />
@@ -40,7 +40,7 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\EHang.FormationCreator\packages\MahApps.Metro.1.2.2.0\lib\net40\System.Windows.Interactivity.dll</HintPath>
+      <HintPath>..\..\Plane.FormationCreator\packages\MahApps.Metro.1.5.0\lib\net40\System.Windows.Interactivity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xaml" />
@@ -71,9 +71,7 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Plane.Windows.Messages/packages.config b/Plane.Windows.Messages/packages.config
index 31671c2..910fe34 100644
--- a/Plane.Windows.Messages/packages.config
+++ b/Plane.Windows.Messages/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MahApps.Metro" version="1.2.2.0" targetFramework="net40" />
+  <package id="MahApps.Metro" version="1.5.0" targetFramework="net40" />
 </packages>
\ No newline at end of file