Merge pull request #4 from Cp0204/master

关键操作确认/同目录不允许多开
codemonkey-m · Jun 24, 2020 · f33c7b9 · f33c7b9
2 parents c70accd + e5f586e
commit f33c7b9
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/FrpClient-Win/AddItemDlg.cs b/FrpClient-Win/AddItemDlg.cs
@@ -57,8 +57,10 @@ public void InitShow(string strSectionName = null)
 
         private void DeleteItem_Click(object sender, System.EventArgs e)
         {
-            DB.Instance().DelItem(cNewItemInfo.strSectionName);
-            Close();
+            if(MessageBox.Show("确定要删除吗？", "删除条目", MessageBoxButtons.OKCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.OK) {
+                DB.Instance().DelItem(cNewItemInfo.strSectionName);
+                Close();
+            }
         }
 
         private void InputAddLoaclIP_DoubleClick(object sender, EventArgs e) {

diff --git a/FrpClient-Win/Form1.cs b/FrpClient-Win/Form1.cs
@@ -35,6 +35,12 @@ private void OnMainFormLoad(object sender, EventArgs e)
         {
             System.IO.Directory.SetCurrentDirectory(System.Windows.Forms.Application.StartupPath);
 
+            // 检查同目录多开
+            if(IsDuplicateInstance()){
+                MessageBox.Show("本程序已经在运行！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                Application.Exit();
+            }
+
             InitList(true);
             UpdateStartButton();
             //notifyIcon.Icon = this.Icon;
@@ -53,6 +59,17 @@ private void OnMainFormLoad(object sender, EventArgs e)
             }
         }
 
+        // 检查是否多开
+        private static bool IsDuplicateInstance() {
+            bool bCreatedNew;
+            // 允许不同目录实例
+            string name = System.Windows.Forms.Application.StartupPath;
+            name = name.Replace("\\", "/");
+            //创建Mutex互斥对象
+            System.Threading.Mutex newMutex = new System.Threading.Mutex(true, name, out bCreatedNew);
+            return !bCreatedNew;
+        }
+
         private void InitList(bool bReadConfig = false)
         {
             if(bReadConfig)
@@ -111,7 +128,7 @@ private void RestartService_Click(object sender, EventArgs e)
         private void MyProcOutputHandler(object sendingProcess,DataReceivedEventArgs outLine)
         {
             if(!String.IsNullOrEmpty(outLine.Data)) {
-                ProcOutput.Text += outLine.Data.ToString()+"\r\n";
+                ProcOutput.AppendText(outLine.Data.ToString() + "\r\n");
                 ProcOutput.SelectionStart = ProcOutput.Text.Length;
                 ProcOutput.ScrollToCaret();
             }
@@ -173,11 +190,15 @@ private void NotifyIcon_MouseClick(object sender, MouseEventArgs e) {
                 this.Show();
                 this.Activate();
                 this.ShowInTaskbar = true;
+                ProcOutput.ScrollToCaret();
             }
         }
+
         private void Exit_toolStripMenuItem_Click(object sender, EventArgs e) {
-            CloseFrp();
-            Application.Exit();
+            if(MessageBox.Show("确定要退出吗？", "退出程序", MessageBoxButtons.OKCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.OK){
+                CloseFrp();
+                Application.Exit();
+            }
         }
 
         private void AutoRun_Click(object sender, EventArgs e)