From ddb91cc0d9ef117a2683e548ebdf023bdba4f0fa Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 9 Aug 2016 20:19:13 +0200
Subject: [PATCH] correct fix for showing dialog from popup callback (EA-86138)

---
 .../KotlinSetupEnvironmentNotificationProvider.kt          | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinSetupEnvironmentNotificationProvider.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinSetupEnvironmentNotificationProvider.kt
index 00b2202235b..96dca13caf6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinSetupEnvironmentNotificationProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinSetupEnvironmentNotificationProvider.kt
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.configuration
 
 import com.intellij.ProjectTopics
-import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.fileEditor.FileEditor
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleUtilCore
@@ -40,7 +39,6 @@ import com.intellij.ui.EditorNotificationPanel
 import com.intellij.ui.EditorNotifications
 import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.KotlinLanguage
-import org.jetbrains.kotlin.idea.project.ProjectStructureUtil
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.idea.versions.UnsupportedAbiVersionNotificationPanelProvider
 import org.jetbrains.kotlin.idea.versions.createComponentActionLabel
@@ -126,12 +124,11 @@ class KotlinSetupEnvironmentNotificationProvider(
                 }
 
                 override fun onChosen(selectedValue: KotlinProjectConfigurator?, finalChoice: Boolean): PopupStep<*>? {
-                    selectedValue?.let {
-                        ApplicationManager.getApplication().invokeLater {
+                    return doFinalStep {
+                        selectedValue?.let {
                             it.configure(project, emptyList())
                         }
                     }
-                    return null
                 }
             }
             val configuratorsPopup = JBPopupFactory.getInstance().createListPopup(step)