From f17891206f0c45c7576adbedc1b46b3cfaf6839b Mon Sep 17 00:00:00 2001
From: Tongg <tongguibina@163.com>
Date: Fri, 27 Dec 2024 16:28:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B6=88=E6=81=AF=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=94=E5=9B=9E=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Views/Dialog/MessageBox.xaml.cs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Views/Dialog/MessageBox.xaml.cs b/Views/Dialog/MessageBox.xaml.cs
index 40c135f..c9b2b81 100644
--- a/Views/Dialog/MessageBox.xaml.cs
+++ b/Views/Dialog/MessageBox.xaml.cs
@@ -24,7 +24,7 @@ public partial class MessageBox : Window
     }
 
     private int _showType = -1;
-    private bool _result = false;
+    private MessageBoxResult _result = MessageBoxResult.None;
     public void Show(String message, String btnStr = "")
     {
         BorderInput.Visibility = Visibility.Hidden;
@@ -65,8 +65,8 @@ public partial class MessageBox : Window
             CancelButtonText.Text = MultilingualHelper.getString("DialogCancelDefaultTitle");
         }
         this.ShowDialog();
-        
-        return _result==true ? MessageBoxResult.OK : MessageBoxResult.Cancel;
+
+        return _result;
     }
     //
     public  MessageBoxResult ShowInput(String message, out String inputStr , String confirmButtonTitle = "", String cancelButtonTitle ="")
@@ -87,12 +87,12 @@ public partial class MessageBox : Window
         this.ShowDialog();
         
         inputStr = TextBoxInput.Text;
-        return _result==true ? MessageBoxResult.OK : MessageBoxResult.Cancel;
+        return _result;
     }
     private void CloseButton_OnClick(object sender, RoutedEventArgs e)
     {
+        _result = MessageBoxResult.None;
         this.Close();
-        
     }
 
     private void ConfirmButton_OnClick(object sender, RoutedEventArgs e)
@@ -102,7 +102,7 @@ public partial class MessageBox : Window
             this.Close();
         }else if (_showType == 1)
         {
-            _result = true;
+            _result = MessageBoxResult.OK;
             this.Close();
         }else if (_showType == 2)
         {
@@ -113,7 +113,7 @@ public partial class MessageBox : Window
             }
             else
             {
-                _result = true;
+                _result = MessageBoxResult.OK;
                 this.Close();
             }
         }
@@ -121,6 +121,7 @@ public partial class MessageBox : Window
 
     private void CancelButton_OnClick(object sender, RoutedEventArgs e)
     {
+        _result = MessageBoxResult.Cancel;
         this.Close();
     }
 }
\ No newline at end of file