From 7b3ecda4841f8ba019ac3b54b82765803e1b9a6e Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 15 Aug 2016 18:35:15 +0200 Subject: [PATCH] Clean-up --- lib/EAPBase_UI/include/EAP_UI.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/lib/EAPBase_UI/include/EAP_UI.h b/lib/EAPBase_UI/include/EAP_UI.h index 36e65b3..6abf1ed 100644 --- a/lib/EAPBase_UI/include/EAP_UI.h +++ b/lib/EAPBase_UI/include/EAP_UI.h @@ -572,31 +572,26 @@ protected: virtual bool TransferDataToWindow() { - // Inherited TransferDataToWindow() calls m_cred.retrieve(). - // Therefore, call it now, to set m_cred. - if (!wxEAPCredentialsPanelBase<_Tcred, wxEAPCredentialsPanelPassBase>::TransferDataToWindow()) - return false; - m_identity->SetValue(m_cred.m_identity); m_identity->SetSelection(0, -1); m_password->SetValue(m_cred.m_password.empty() ? wxEmptyString : s_dummy_password); - return true; + return wxEAPCredentialsPanelBase<_Tcred, wxEAPCredentialsPanelPassBase>::TransferDataToWindow(); } virtual bool TransferDataFromWindow() { - m_cred.m_identity = m_identity->GetValue(); + if (!wxEAPCredentialsPanelBase<_Tcred, wxEAPCredentialsPanelPassBase>::TransferDataFromWindow()) + return false; + m_cred.m_identity = m_identity->GetValue(); wxString pass = m_password->GetValue(); if (pass.compare(s_dummy_password) != 0) { m_cred.m_password = pass; pass.assign(pass.length(), wxT('*')); } - // Inherited TransferDataFromWindow() calls m_cred.store(). - // Therefore, call it only now, that m_cred is set. - return wxEAPCredentialsPanelBase<_Tcred, wxEAPCredentialsPanelPassBase>::TransferDataFromWindow(); + return true; } virtual void OnUpdateUI(wxUpdateUIEvent& event)