From 22cc96e2b10dd7e880ec196998cf484eb58689c8 Mon Sep 17 00:00:00 2001
From: XAS-712 <xas712@126.com>
Date: Mon, 31 Dec 2018 01:02:44 +0800
Subject: [PATCH] fixed cache bugs

---
 MifareOneTool/Form1.cs                   | 23 ++++++++++++++++-------
 MifareOneTool/Properties/AssemblyInfo.cs |  4 ++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/MifareOneTool/Form1.cs b/MifareOneTool/Form1.cs
index ef94549..f6d6d1c 100644
--- a/MifareOneTool/Form1.cs
+++ b/MifareOneTool/Form1.cs
@@ -50,21 +50,30 @@ namespace MifareOneTool
                 ofd.Title = "请选择MFD文件保存位置及文件名";
                 ofd.OverwritePrompt = true;
                 ofd.Filter = "MFD文件|*.mfd";
-                if (ofd.ShowDialog() == DialogResult.OK)
+                if (File.Exists(omfd) && new FileInfo(omfd).Length > 1)
                 {
-                    if(File.Exists(ofd.FileName)){
-                        File.Delete(ofd.FileName);
+                    if (ofd.ShowDialog() == DialogResult.OK)
+                    {
+                        if (File.Exists(ofd.FileName))
+                        {
+                            File.Delete(ofd.FileName);
+                        }
+                        File.Move(omfd, ofd.FileName);
+                        logAppend("##已保存-" + ofd.FileName + "##");
+                    }
+                    else
+                    {
+                        File.Delete(omfd);
+                        logAppend("##未保存##");
                     }
-                    File.Move(omfd, ofd.FileName);
-                    logAppend("##已保存-" + ofd.FileName + "##");
                 }
                 else
                 {
                     File.Delete(omfd);
-                    logAppend("##未保存##");
+                    logAppend("##缓存文件异常##");
                 }
                 omfd = "";
-Text = "MifareOne Tool - 运行完毕";
+                Text = "MifareOne Tool - 运行完毕";
             }
         }
 
diff --git a/MifareOneTool/Properties/AssemblyInfo.cs b/MifareOneTool/Properties/AssemblyInfo.cs
index 44da6b7..f847253 100644
--- a/MifareOneTool/Properties/AssemblyInfo.cs
+++ b/MifareOneTool/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.2.0")]
-[assembly: AssemblyFileVersion("1.3.2.0")]
+[assembly: AssemblyVersion("1.3.3.0")]
+[assembly: AssemblyFileVersion("1.3.3.0")]