From c4900f5a66d6c75cd12d3fb2b79425a8d0caae5d Mon Sep 17 00:00:00 2001 From: David Sparer Date: Sat, 29 Jul 2017 22:07:51 -0500 Subject: [PATCH] fixed cred id showing up in config window --- mRemoteV1/UI/Controls/CredentialRecordListAdaptor.cs | 5 ++--- mRemoteV1/UI/Controls/CredentialRecordListBox.cs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mRemoteV1/UI/Controls/CredentialRecordListAdaptor.cs b/mRemoteV1/UI/Controls/CredentialRecordListAdaptor.cs index e3e51ca75..96839f0e9 100644 --- a/mRemoteV1/UI/Controls/CredentialRecordListAdaptor.cs +++ b/mRemoteV1/UI/Controls/CredentialRecordListAdaptor.cs @@ -3,8 +3,7 @@ using System.ComponentModel; using System.Drawing.Design; using System.Windows.Forms.Design; using mRemoteNG.App; -using mRemoteNG.Credential; - +using mRemoteNG.Tools; namespace mRemoteNG.UI.Controls { @@ -38,7 +37,7 @@ namespace mRemoteNG.UI.Controls //return newCred; } - return listBox.SelectedItem ?? value; + return listBox.SelectedItem.Id.Maybe() ?? value; } private void ListBoxOnSelectedValueChanged(object sender, EventArgs eventArgs) diff --git a/mRemoteV1/UI/Controls/CredentialRecordListBox.cs b/mRemoteV1/UI/Controls/CredentialRecordListBox.cs index 135d2f8ad..fd0aeb19a 100644 --- a/mRemoteV1/UI/Controls/CredentialRecordListBox.cs +++ b/mRemoteV1/UI/Controls/CredentialRecordListBox.cs @@ -3,11 +3,11 @@ using System.ComponentModel; using System.Windows.Forms; using mRemoteNG.Credential; - namespace mRemoteNG.UI.Controls { public partial class CredentialRecordListBox : ListBox { + public new ICredentialRecord SelectedItem => (ICredentialRecord)base.SelectedItem; public ICredentialRecord NoneSelection { get; } = new CredentialRecord { Title = $"--{Language.strNone}--" }; public ICredentialRecord AddNewSelection { get; } = new CredentialRecord { Title = $"--{Language.strAdd}--" };