Commit e74df40c authored by wangjunqiang's avatar wangjunqiang

同步

parent f4b5b84e
...@@ -1662,7 +1662,7 @@ namespace GcDevicePc ...@@ -1662,7 +1662,7 @@ namespace GcDevicePc
OpenFileDialog fileDlg = new OpenFileDialog(); OpenFileDialog fileDlg = new OpenFileDialog();
fileDlg.Multiselect = false; fileDlg.Multiselect = false;
fileDlg.InitialDirectory = globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder; fileDlg.InitialDirectory = globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder;
fileDlg.RestoreDirectory = false; fileDlg.RestoreDirectory = true;
fileDlg.Title = "请选择方法文件"; fileDlg.Title = "请选择方法文件";
fileDlg.Filter = "配置文件(*.ini)|*.ini"; fileDlg.Filter = "配置文件(*.ini)|*.ini";
if (fileDlg.ShowDialog() == DialogResult.OK) if (fileDlg.ShowDialog() == DialogResult.OK)
...@@ -2056,6 +2056,7 @@ namespace GcDevicePc ...@@ -2056,6 +2056,7 @@ namespace GcDevicePc
} }
} }
if (SharedSpace.MControl.forceEnd && SharedSpace.MControl.SetOut && SharedSpace.MControl.SetRun) if (SharedSpace.MControl.forceEnd && SharedSpace.MControl.SetOut && SharedSpace.MControl.SetRun)
{ {
SharedSpace.MControl.IsEnd = false; SharedSpace.MControl.IsEnd = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment