diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ModulesComboBoxAction.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ModulesComboBoxAction.kt index 550447cfc61..c31af815b84 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ModulesComboBoxAction.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ModulesComboBoxAction.kt @@ -49,7 +49,7 @@ class ModulesComboBoxAction(private val scratchFile: ScratchFile) : LabeledCombo override fun update(e: AnActionEvent) { super.update(e) - val selectedModule = scratchFile.module + val selectedModule = scratchFile.module?.takeIf { !it.isDisposed } e.presentation.apply { icon = selectedModule?.let { ModuleType.get(it).icon } diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ModulesComboBoxAction.kt.183 b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ModulesComboBoxAction.kt.183 index 13946d76e2c..314f22af31e 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ModulesComboBoxAction.kt.183 +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ModulesComboBoxAction.kt.183 @@ -49,7 +49,7 @@ class ModulesComboBoxAction(private val scratchFile: ScratchFile) : LabeledCombo override fun update(e: AnActionEvent) { super.update(e) - val selectedModule = scratchFile.module + val selectedModule = scratchFile.module?.takeIf { !it.isDisposed } e.presentation.apply { icon = selectedModule?.let { ModuleType.get(it).icon }