Browse Source

Merge branch 'master' of ssh://10.10.100.21/source/mes-client

Hcsy 8 years ago
parent
commit
39b317955b
1 changed files with 10 additions and 4 deletions
  1. 10 4
      UAS-MES/CustomControl/BaseForm/BaseForm.cs

+ 10 - 4
UAS-MES/CustomControl/BaseForm/BaseForm.cs

@@ -18,14 +18,20 @@ namespace UAS_MES.CustomControl.BaseForm
 
         private void BaseForm_Load(object sender, EventArgs e)
         {
-            Main main = Application.OpenForms["Main"] as Main;
-            main.TopMost = false;
+            if (!DesignMode)
+            {
+                Main main = Application.OpenForms["Main"] as Main;
+                main.TopMost = false;
+            }
         }
 
         private void BaseForm_FormClosing(object sender, FormClosingEventArgs e)
         {
-            Main main = Application.OpenForms["Main"] as Main;
-            main.TopMost = (main.Controls["headBar1"].Controls["AlwaysTop"] as CheckBox).Checked;
+            if (!DesignMode)
+            {
+                Main main = Application.OpenForms["Main"] as Main;
+                main.TopMost = (main.Controls["headBar1"].Controls["AlwaysTop"] as CheckBox).Checked;
+            }
         }
     }
 }