From 459b771ee691c9166862325b38b5d08bb31fbb17 Mon Sep 17 00:00:00 2001
From: Valentina Kiryushkina <valentina.kiryushkina@jetbrains.com>
Date: Fri, 29 Jul 2016 11:35:20 +0300
Subject: [PATCH] Show error in login dialog if user failed to login

---
 .../com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java b/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java
index f9b3b14a1849..5ecca3f399a8 100644
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java
@@ -334,7 +334,6 @@ public class StudyNewProjectPanel extends JPanel implements PanelWithAnchor {
     @Override
     protected void doOKAction() {
       if (!validateLoginAndPasswordFields()) return;
-      super.doJustOkAction();
 
       ProgressManager.getInstance().runProcessWithProgressSynchronously(() -> {
         ProgressManager.getInstance().getProgressIndicator().setIndeterminate(true);
@@ -342,6 +341,7 @@ public class StudyNewProjectPanel extends JPanel implements PanelWithAnchor {
         final StepicUser stepicUser = StudyUtils.execCancelable(() -> EduStepicConnector.login(myLoginPanel.getLogin(),
                                                                                                myLoginPanel.getPassword()));
         if (stepicUser != null) {
+          ApplicationManager.getApplication().invokeLater(() -> super.doJustOkAction());
           stepicUser.setEmail(myLoginPanel.getLogin());
           stepicUser.setPassword(myLoginPanel.getPassword());
           myGenerator.myUser = stepicUser;
@@ -354,7 +354,7 @@ public class StudyNewProjectPanel extends JPanel implements PanelWithAnchor {
           setOK();
         }
         else {
-          setError("Failed to login");
+          this.setErrorText("Failed to login");
         }
       }, myProgressTitle, true, new DefaultProjectFactoryImpl().getDefaultProject());
     }