From 90216161fb17ec3eed5086143f0e4f307dc7ca0c Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 17 Sep 2012 17:31:52 -0500 Subject: [PATCH] IDEMPIERE-433 login screen not show by exception when get USE_EMAIL_FOR_LOGIN --- org.adempiere.ui.swing/src/org/compiere/apps/ALogin.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/ALogin.java b/org.adempiere.ui.swing/src/org/compiere/apps/ALogin.java index 286aed7677..0618470bb2 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/ALogin.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/ALogin.java @@ -593,8 +593,10 @@ public final class ALogin extends CDialog else if (e.getActionCommand().equals(ConfirmPanel.A_CANCEL)) appExit(); // - else if (e.getSource() == hostField) + else if (e.getSource() == hostField) { validateConnection(); + languageComboChanged(); + } else if (e.getSource() == languageCombo) languageComboChanged(); // @@ -1174,7 +1176,7 @@ public final class ALogin extends CDialog // this.setTitle(res.getString("Login")); hostLabel.setText(res.getString("Host")); - boolean email_login = MSysConfig.getBooleanValue(MSysConfig.USE_EMAIL_FOR_LOGIN, false); + boolean email_login = (DB.isConnected() && MSysConfig.getBooleanValue(MSysConfig.USE_EMAIL_FOR_LOGIN, false)); if (email_login) userLabel.setText(res.getString("EMail")); else