Check for project disposal before adapter.createInstance

JetBrains · Jun 12, 2024 · 1b23144 · 1b23144
1 parent b231130
commit 1b23144
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/platform/platform-impl/src/com/intellij/ui/EditorNotificationsImpl.kt b/platform/platform-impl/src/com/intellij/ui/EditorNotificationsImpl.kt
@@ -230,7 +230,10 @@ class EditorNotificationsImpl(private val project: Project,
  if (project.isDisposed) {
  return@launch
  }
- val provider = adapter.createInstance<EditorNotificationProvider>(project) ?: continue
+ val provider = readAction {
+ // isDisposed is only valid within a read action; see documentation in ComponentManager.
+ if (project.isDisposed) null else adapter.createInstance<EditorNotificationProvider>(project)
+ } ?: continue
 
  coroutineContext.ensureActive()