Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

wells

2020-07-11 0dfbcfad8bbbeae5218293d59aba851fd8e65a90

 src/Bro.Common.Model/Forms/FrmDeviceOpConfigEditor.cs

@@ -91,7 +91,7 @@
                var attr = device.GetType().GetCustomAttribute<DeviceAttribute>();
                if (attr != null)
                {
                    var opConfig= ConfigFactory.GetOperationConfig(attr.TypeCode);
                    var opConfig = ConfigFactory.GetOperationConfig(attr.TypeCode);
                    opConfig.DeviceId = device.Id;
                    propGrid.SelectedObject = opConfig;
                }
@@ -120,6 +120,7 @@
        {
            Bind.Device = cboDevice.SelectedValue.ToString();
            Bind.OpConfig = propGrid.SelectedObject as IOperationConfig;
            Bind.OpConfig.DeviceId = Bind.Device;
            this.DialogResult = DialogResult.OK;
        }