azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EA-215324: Fix "Module already disposed" in Scratch combo-box

Browse Source
This commit is contained in:
Yan Zhulanow
2019-11-13 20:55:24 +09:00
parent 3d17af0ada
commit 3534d4af36
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ModulesComboBoxAction.kt
+1 -1
View File
@@ -49,7 +49,7 @@ class ModulesComboBoxAction(private val scratchFile: ScratchFile) : LabeledCombo
override fun update(e: AnActionEvent) { override fun update(e: AnActionEvent) {
super.update(e) super.update(e)
val selectedModule = scratchFile.module val selectedModule = scratchFile.module?.takeIf { !it.isDisposed }
e.presentation.apply { e.presentation.apply {
icon = selectedModule?.let { ModuleType.get(it).icon } icon = selectedModule?.let { ModuleType.get(it).icon }
idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ModulesComboBoxAction.kt.183
+1 -1
View File
@@ -49,7 +49,7 @@ class ModulesComboBoxAction(private val scratchFile: ScratchFile) : LabeledCombo
override fun update(e: AnActionEvent) { override fun update(e: AnActionEvent) {
super.update(e) super.update(e)
val selectedModule = scratchFile.module val selectedModule = scratchFile.module?.takeIf { !it.isDisposed }
e.presentation.apply { e.presentation.apply {
icon = selectedModule?.let { ModuleType.get(it).icon } icon = selectedModule?.let { ModuleType.get(it).icon }