From aef0e89de0fa97e87920a10d817636633751f02a Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Thu, 23 Sep 2021 02:54:02 +0800
Subject: [PATCH] =?UTF-8?q?fix.=E7=95=8C=E9=9D=A2=E4=B8=8A=E5=90=83?=
 =?UTF-8?q?=E8=8D=AF=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MeoAssistance/Logger.hpp                        | 1 -
 src/MeoAsstGui/Helper/ViewStatusStorage.cs          | 2 +-
 src/MeoAsstGui/ViewModels/MainFunctionViewModel.cs  | 7 ++++++-
 src/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs | 1 -
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/MeoAssistance/Logger.hpp b/src/MeoAssistance/Logger.hpp
index 11e0f971be..362cb06e30 100644
--- a/src/MeoAssistance/Logger.hpp
+++ b/src/MeoAssistance/Logger.hpp
@@ -7,7 +7,6 @@
 #include <type_traits>
 
 #include "AsstAux.h"
-#include "AsstPort.h"
 #include "Version.h"
 
 namespace asst {
diff --git a/src/MeoAsstGui/Helper/ViewStatusStorage.cs b/src/MeoAsstGui/Helper/ViewStatusStorage.cs
index e0b6190232..e948fc1697 100644
--- a/src/MeoAsstGui/Helper/ViewStatusStorage.cs
+++ b/src/MeoAsstGui/Helper/ViewStatusStorage.cs
@@ -36,7 +36,7 @@ namespace MeoAsstGui
                     _viewStatus = (JObject)JsonConvert.DeserializeObject(jsonStr);
                 }
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 _viewStatus = new JObject();
                 return false;
diff --git a/src/MeoAsstGui/ViewModels/MainFunctionViewModel.cs b/src/MeoAsstGui/ViewModels/MainFunctionViewModel.cs
index fdec16bc3d..6bfe45d050 100644
--- a/src/MeoAsstGui/ViewModels/MainFunctionViewModel.cs
+++ b/src/MeoAsstGui/ViewModels/MainFunctionViewModel.cs
@@ -231,6 +231,7 @@ namespace MeoAsstGui
 
             CatchStatus = "";
             ExecInfo = "";
+            MedicineInfo = "";
             StoneInfo = "";
             RunStatus = "";
         }
@@ -245,9 +246,13 @@ namespace MeoAsstGui
                 return;
             }
             ExecInfo = "";
+            if (UseMedicine)
+            {
+                MedicineInfo = "已吃药 0 个";
+            }
             if (UseStone)
             {
-                StoneInfo = "已碎石 0 个";
+                StoneInfo = "已碎石 0 颗";
             }
         }
 
diff --git a/src/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs b/src/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs
index e7896ec91b..f2ae03d9aa 100644
--- a/src/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs
+++ b/src/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs
@@ -70,7 +70,6 @@ namespace MeoAsstGui
             {
                 return string.Empty;
             }
-            return string.Empty;
         }
 
         private string _latestUrl = "https://github.com/MistEO/MeoAssistance/releases/latest";