From 67c0c0d55c193d00ef6f3481e1f081d236bcab13 Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期五, 10 七月 2020 12:55:32 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.UI.Config/MainFrm.cs | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/src/Bro.UI.Config/MainFrm.cs b/src/Bro.UI.Config/MainFrm.cs
index 39c483d..39c3169 100644
--- a/src/Bro.UI.Config/MainFrm.cs
+++ b/src/Bro.UI.Config/MainFrm.cs
@@ -74,10 +74,10 @@
//});
m_deserializeMenuFrm = new DeserializeDockContent(GetMenuFromPersistString);
- LoadLayoutFromXML(m_deserializeMenuFrm);
-
m_deserializeDeviceRunFrm = new DeserializeDockContent(GetAllFormPersistString);
- _allMenuLoadDoneHandle.Set();
+
+ //LoadLayoutFromXML(m_deserializeMenuFrm);
+ //_allMenuLoadDoneHandle.Set();
Text = SettingHelper.GetProgramDescription();
string iconPath = SettingHelper.GetProgramIcon();
@@ -254,13 +254,16 @@
private void MainFrm_Load(object sender, EventArgs e)
{
+ LoadLayoutFromXML(m_deserializeMenuFrm);
+ _allMenuLoadDoneHandle.Set();
+
AdvancedPwdFrm.OnLoginOK = OnLoginOK;
- SpinWait wait = new SpinWait();
- while (_process == null)
- {
- wait.SpinOnce();
- }
+ //SpinWait wait = new SpinWait();
+ //while (_process == null)
+ //{
+ // wait.SpinOnce();
+ //}
LoadLayoutFromXML(m_deserializeDeviceRunFrm);
}
@@ -542,10 +545,10 @@
dockFrm.Text = desc[2];
- if (_process != null)
- {
- dockFrm.DownloadProcess(_process);
- }
+ //if (_process != null)
+ //{
+ // dockFrm.DownloadProcess(_process);
+ //}
dockFrm.SetLoginStatus(IsLogin);
@@ -580,10 +583,10 @@
dockFrm.Text = desc[2];
- if (_process != null)
- {
- dockFrm.DownloadProcess(_process);
- }
+ //if (_process != null)
+ //{
+ // dockFrm.DownloadProcess(_process);
+ //}
dockFrm.SetLoginStatus(IsLogin);
--
Gitblit v1.8.0