From 8d2d708d6c732503ff895424935df8ead98cd841 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Mon, 18 Mar 2019 14:45:09 +0300 Subject: [PATCH] EA-139819 - assert: ComponentManagerImpl.lambda$throwAlreadyDisposed$ --- .../openapi/vcs/impl/LineStatusTrackerManager.kt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.kt index 7c2f0f9d0bbc..9f14c0f3f27b 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.kt +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.kt @@ -19,7 +19,6 @@ import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.editor.Document import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.EditorFactory -import com.intellij.openapi.editor.EditorKind import com.intellij.openapi.editor.event.DocumentEvent import com.intellij.openapi.editor.event.DocumentListener import com.intellij.openapi.editor.event.EditorFactoryEvent @@ -755,16 +754,19 @@ class LineStatusTrackerManager( class CheckinFactory : CheckinHandlerFactory() { override fun createHandler(panel: CheckinProjectPanel, commitContext: CommitContext): CheckinHandler { + val project = panel.project return object : CheckinHandler() { override fun checkinSuccessful() { - runInEdt { - getInstanceImpl(panel.project).resetExcludedFromCommitMarkers() - } + resetExcludedFromCommit() } override fun checkinFailed(exception: MutableList?) { + resetExcludedFromCommit() + } + + private fun resetExcludedFromCommit() { runInEdt { - getInstanceImpl(panel.project).resetExcludedFromCommitMarkers() + if (!project.isDisposed) getInstanceImpl(project).resetExcludedFromCommitMarkers() } } }