From cc5d23440eb25c11131a2c3694a6f4fed405d878 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Mon, 28 Aug 2017 14:11:42 +0200
Subject: [PATCH] Correctly check for project disposed (EA-103064)

---
 .../configuration/ConfigureKotlinInProjectUtils.kt     | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt
index a99176c4f14..eccee6d9df1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt
@@ -109,18 +109,16 @@ fun isModuleConfigured(moduleSourceRootGroup: ModuleSourceRootGroup): Boolean {
 }
 
 fun getModulesWithKotlinFiles(project: Project): Collection<Module> {
-    if (project.isDisposed) {
-        return emptyList()
-    }
-
-    if (!runReadAction { FileTypeIndex.containsFileOfType (KotlinFileType.INSTANCE, GlobalSearchScope.projectScope(project)) }) {
+    if (!runReadAction {
+        !project.isDisposed && FileTypeIndex.containsFileOfType (KotlinFileType.INSTANCE, GlobalSearchScope.projectScope(project))
+    }) {
         return emptyList()
     }
 
     return project.allModules()
             .filter { module ->
                 runReadAction {
-                    FileTypeIndex.containsFileOfType(KotlinFileType.INSTANCE, module.getModuleScope(true))
+                    !project.isDisposed && FileTypeIndex.containsFileOfType(KotlinFileType.INSTANCE, module.getModuleScope(true))
                 }
             }
 }