From 585a5fddf52f882f1cadba469c3f45dcfa892df6 Mon Sep 17 00:00:00 2001
From: komaruchan <sandy_0308@hotmail.com>
Date: Tue, 26 May 2015 19:24:22 +0800
Subject: [PATCH] fix the validation logic in FeedbackForm

---
 mp4box/FeedbackForm.cs | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/mp4box/FeedbackForm.cs b/mp4box/FeedbackForm.cs
index 286bff0..43c005d 100644
--- a/mp4box/FeedbackForm.cs
+++ b/mp4box/FeedbackForm.cs
@@ -45,17 +45,9 @@ namespace mp4box
 
         private string ReadLogFile(string logPath)
         {
-            if (File.Exists(logPath))
-            {
-                string logContent = File.ReadAllText(logPath);
-                //logContent = logContent.Replace("\r\n", "<br /");
-                return File.ReadAllText(logPath);
-            }
-            else
-            {
-                ShowErrorMessage("请输入正确的日志文件路径!");
-                return string.Empty;
-            }
+            string logContent = File.ReadAllText(logPath);
+            //logContent = logContent.Replace("\r\n", "<br /");
+            return logContent;
         }
 
         private void PostButton_Click(object sender, EventArgs e)
@@ -65,7 +57,19 @@ namespace mp4box
             string email = EmailTextBox.Text;
             string title = TitleTextBox.Text;
             string msg = MessageTextBox.Text;
-            string log = ReadLogFile(LogPathTextBox.Text);
+            string log = "";
+            if (!string.IsNullOrEmpty(LogPathTextBox.Text))
+            {
+                if (File.Exists(LogPathTextBox.Text))
+                {
+                    log = ReadLogFile(LogPathTextBox.Text);
+                }
+                else
+                {
+                    ShowErrorMessage("请输入正确的日志文件路径!");
+                    return;
+                }
+            }
 
             if (string.IsNullOrEmpty(name) || string.IsNullOrEmpty(title) || string.IsNullOrEmpty(email) || string.IsNullOrEmpty(msg))
             {
@@ -74,7 +78,7 @@ namespace mp4box
             }
 
             ServiceReference.WebServiceSoapClient service = new ServiceReference.WebServiceSoapClient();
-            bool flag = service.PostFeedback(name, qq, email, title, msg,log);
+            bool flag = service.PostFeedback(name, qq, email, title, msg, log);
 
             if (flag)
             {
-- 
2.11.4.GIT