From 34a4e401a6838ce93c00e7d40220e9b1bb4b3c56 Mon Sep 17 00:00:00 2001
From: "Roman.Ivanov" <Roman.Ivanov@jetbrains.com>
Date: Fri, 11 Oct 2019 15:51:31 +0700
Subject: [PATCH] Use proper gradle home, when it is correct and replace path
 in field: IDEA-224160

GitOrigin-RevId: 718c3ebb470bd454822000bf5155a83f4e92e7da
---
 .../IdeaGradleProjectSettingsControlBuilder.java | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java
index 6cdeae917fcd..38724801b09c 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java
@@ -538,9 +538,19 @@ public class IdeaGradleProjectSettingsControlBuilder implements GradleProjectSet
     if (myGradleHomePathField != null) {
       String gradleHomePath = FileUtil.toCanonicalPath(myGradleHomePathField.getText());
       File gradleHomeFile = new File(gradleHomePath);
-      String finalGradleHomePath = myInstallationManager.isGradleSdkHome(gradleHomeFile)
-                                   ? myInstallationManager.suggestBetterGradleHomePath(gradleHomePath)
-                                   : gradleHomePath;
+      String finalGradleHomePath;
+      if (myInstallationManager.isGradleSdkHome(gradleHomeFile)) {
+        finalGradleHomePath = gradleHomePath;
+      }
+      else {
+        finalGradleHomePath = myInstallationManager.suggestBetterGradleHomePath(gradleHomePath);
+        if (finalGradleHomePath != null) {
+          //noinspection SSBasedInspection
+          SwingUtilities.invokeLater(() -> {
+            myGradleHomePathField.setText(finalGradleHomePath);
+          });
+        }
+      }
       if (StringUtil.isEmpty(finalGradleHomePath)) {
         settings.setGradleHome(null);
       }